X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg.sh;h=6c28467d8829f46d370c415d051ff453cf0e646c;hp=b2b9191c0ae847952be9217fa11d7061fca33f12;hb=459c340fd5ac765ff1e5d82895b59b53b028aaca;hpb=54f24fdf5691baa3dcc7252098efd13cc4fc1620

diff --git a/tg.sh b/tg.sh
index b2b9191..6c28467 100644
--- a/tg.sh
+++ b/tg.sh
@@ -20,7 +20,7 @@ die()
 # setup_hook NAME
 setup_hook()
 {
-	hook_call="\"\$(tg --hooks-path)\"/$1 \"\$@\""
+	hook_call="\"\$($tg --hooks-path)\"/$1 \"\$@\""
 	if [ -f "$git_dir/hooks/$1" ] &&
 	   fgrep -q "$hook_call" "$git_dir/hooks/$1"; then
 		# Another job well done!
@@ -223,7 +223,7 @@ do_help()
 		done
 
 		echo "TopGit v0.2 - A different patch queue manager"
-		echo "Usage: tg ($cmds|help) ..."
+		echo "Usage: tg [-r REMOTE] ($cmds|help) ..."
 	elif [ -r "@sharedir@/tg-$1.txt" ] ; then
 		cat "@sharedir@/tg-$1.txt"
 	else
@@ -238,6 +238,7 @@ set -e
 git_dir="$(git rev-parse --git-dir)"
 root_dir="$(git rev-parse --show-cdup)"; 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
 setup_ours
 setup_hook "pre-commit"
@@ -251,6 +252,11 @@ setup_hook "pre-commit"
 # this is set by hooks.
 [ -z "$tg__include" ] || return 0
 
+if [ "$1" = "-r" ]; then
+	shift; base_remote="$1"; shift
+	tg="$tg -r $base_remote"
+fi
+
 cmd="$1"
 [ -n "$cmd" ] || die "He took a duck in the face at two hundred and fifty knots"
 shift