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

diff --git a/tg.sh b/tg.sh
index 7005f98..2961106 100644
--- a/tg.sh
+++ b/tg.sh
@@ -222,7 +222,7 @@ 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 || :
@@ -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