X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg.sh;h=4fef7796c53e59bc5829ca3a727c65a58e4eb3ab;hb=897a2bd3fdb31a1372ac3f522befa2d5a5f7c07a;hp=146cddaa2bf3e1b22d0b5b2f089ce522b1a61a2e;hpb=99fb3f384a10b2c000b9a4c49eb5fc4fc518db7f;p=topgit.git diff --git a/tg.sh b/tg.sh index 146cdda..4fef779 100644 --- 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