tg-export: New command for cleaning up history

[topgit.git] / tg.sh

diff --git a/tg.sh b/tg.sh
index 6312d0064d9fcb9529cf24b11f0aea1324bb79ae..a844b5ed2828a27d8018955913474bb5274040ed 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/$_name" "$_dep"; then
+       elif [ -n "$_name" ] && ! branch_contains "refs/top-bases/$_name" "$_dep"; then
                # Some new commits in _dep
                echo "$_dep $_depchain"
                _ret=1