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

diff --git a/tg.sh b/tg.sh
index 7005f98..a8eb718 100644
--- a/tg.sh
+++ b/tg.sh
@@ -222,13 +222,13 @@ do_help()
 			sep="|"
 		done
 
-		echo "TopGit v0.4 - A different patch queue manager"
+		echo "TopGit v0.5 - A different patch queue manager"
 		echo "Usage: tg [-r REMOTE] ($cmds|help) ..."
 	elif [ -r "@cmddir@"/tg-$1 ] ; then
 		@cmddir@/tg-$1 -h || :
 		echo
-		if [ -r "@sharedir@/tg-$1.txt" ] ; then
-			cat "@sharedir@/tg-$1.txt"
+		if [ -r "@docdir@/tg-$1.txt" ] ; then
+			cat "@docdir@/tg-$1.txt"
 		fi
 	else
 		echo "`basename $0`: no help for $1" 1>&2
@@ -241,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