Fix recursive tg calls: Pass tg parameters through properly

[topgit.git] / tg.sh

diff --git a/tg.sh b/tg.sh
index 2294a99250b220ee5eed62b2465490948fb5ad23..6c28467d8829f46d370c415d051ff453cf0e646c 100644 (file)
--- 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!
@@ -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"
@@ -253,6 +254,7 @@ setup_hook "pre-commit"
 
 if [ "$1" = "-r" ]; then
        shift; base_remote="$1"; shift
+       tg="$tg -r $base_remote"
 fi
 
 cmd="$1"