X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg.sh;h=a8eb71870f1cab15b8705e8c6a7fd7c4cdf8fee7;hb=d3555d507ed4508f89f47bd0320780ad738ba83e;hp=084dc5446e0fdf9e7cd5eaa4675ab7e4d1d3c06e;hpb=ce7d8a0e041070b5773325da256113a10e344eb1;p=topgit.git

diff --git a/tg.sh b/tg.sh
index 084dc54..a8eb718 100644
--- a/tg.sh
+++ b/tg.sh
@@ -26,7 +26,7 @@ setup_hook()
 		# Another job well done!
 		return
 	fi
-	# Prepare incanation
+	# Prepare incantation
 	if [ -x "$git_dir/hooks/$1" ]; then
 		hook_call="$hook_call"' || exit $?'
 	else
@@ -222,10 +222,14 @@ do_help()
 			sep="|"
 		done
 
-		echo "TopGit v0.2 - A different patch queue manager"
+		echo "TopGit v0.5 - A different patch queue manager"
 		echo "Usage: tg [-r REMOTE] ($cmds|help) ..."
-	elif [ -r "@sharedir@/tg-$1.txt" ] ; then
-		cat "@sharedir@/tg-$1.txt"
+	elif [ -r "@cmddir@"/tg-$1 ] ; then
+		@cmddir@/tg-$1 -h || :
+		echo
+		if [ -r "@docdir@/tg-$1.txt" ] ; then
+			cat "@docdir@/tg-$1.txt"
+		fi
 	else
 		echo "`basename $0`: no help for $1" 1>&2
 	fi
@@ -237,6 +241,8 @@ do_help()
 set -e
 git_dir="$(git rev-parse --git-dir)"
 root_dir="$(git rev-parse --show-cdup)"; root_dir="${root_dir:-.}"
+# Make sure root_dir doesn't end with a trailing slash.
+root_dir="${root_dir%/}"
 base_remote="$(git config topgit.remote 2>/dev/null)" || :
 tg="tg"
 # make sure merging the .top* files will always behave sanely