X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg-patch.sh;h=7a2471827d1e27db9a520f51541cecc4dd69c12a;hb=67921ef309b025a2fea1c2311f93566ba2807b57;hp=45da3042455cbc466553451e8cb89627093c4804;hpb=308892d0c071135031994606170c8be6653e7197;p=topgit.git

diff --git a/tg-patch.sh b/tg-patch.sh
index 45da304..7a24718 100644
--- a/tg-patch.sh
+++ b/tg-patch.sh
@@ -12,7 +12,7 @@ while [ -n "$1" ]; do
 	arg="$1"; shift
 	case "$arg" in
 	-*)
-		echo "Usage: tg patch [NAME]" >&2
+		echo "Usage: tg [...] patch [NAME]" >&2
 		exit 1;;
 	*)
 		[ -z "$name" ] || die "name already specified ($name)"
@@ -29,7 +29,7 @@ echo
 [ -n "$(git grep '^[-]--' "$name" -- ".topmsg")" ] || echo '---'
 
 # Evil obnoxious hack to work around the lack of git diff --exclude
-git_is_stupid="$(mktemp)"
+git_is_stupid="$(mktemp -t tg-patch-changes.XXXXXX)"
 git diff-tree --name-only "$base_rev" "$name" |
 	fgrep -vx ".topdeps" |
 	fgrep -vx ".topmsg" >"$git_is_stupid" || : # fgrep likes to fail randomly?
@@ -41,6 +41,6 @@ fi
 rm "$git_is_stupid"
 
 echo '-- '
-echo "tg: ($base_rev..) $name (depends on $(git cat-file blob "$name:.topdeps"))"
+echo "tg: ($base_rev..) $name (depends on: $(git cat-file blob "$name:.topdeps" | paste -s -d' '))"
 branch_contains "$name" "$base_rev" ||
-	echo "tg: The patch is out-of-date wrt. the base! Run \`tg update\`."
+	echo "tg: The patch is out-of-date wrt. the base! Run \`$tg update\`."