chiark / gitweb /
recurse_deps(): Call itself, not needs_update(), recursively
[topgit.git] / tg.sh
diff --git a/tg.sh b/tg.sh
index 146cddaa2bf3e1b22d0b5b2f089ce522b1a61a2e..4fef7796c53e59bc5829ca3a727c65a58e4eb3ab 100644 (file)
--- a/tg.sh
+++ b/tg.sh
@@ -111,7 +111,7 @@ recurse_deps()
 
                # Shoo shoo, keep our environment alone!
                [ -z "$_dep_is_tgish" ] ||
-                       (needs_update "$_cmd" "$_dep" "$@") ||
+                       (recurse_deps "$_cmd" "$_dep" "$@") ||
                        _ret=$?
 
                eval "$_cmd"
@@ -139,7 +139,7 @@ branch_needs_update()
                # _dep needs to be synced with its base
                echo ": $_dep $_depchain"
                _ret=1
-       elif ! branch_contains "refs/top-bases/$1" "$_dep"; then
+       elif ! branch_contains "refs/top-bases/$_name" "$_dep"; then
                # Some new commits in _dep
                echo "$_dep $_depchain"
                _ret=1