Fix recursive tg calls: Pass tg parameters through properly

[topgit.git] / tg-summary.sh

diff --git a/tg-summary.sh b/tg-summary.sh
index 8616d074dc6f392f9ec1df1533339bfa6ffdc021..4ffebcefda524f434860306779cd541d21477af5 100644 (file)
--- a/tg-summary.sh
+++ b/tg-summary.sh
@@ -11,6 +11,8 @@ if [ -n "$1" ]; then
        exit 1
 fi
 
+curname="$(git symbolic-ref HEAD | sed 's#^refs/\(heads\|top-bases\)/##')"
+
 
 ## List branches
 
@@ -19,17 +21,19 @@ git for-each-ref refs/top-bases |
                name="${ref#refs/top-bases/}"
                missing_deps=
 
+               current=' '
+               [ "$name" != "$curname" ] || current='>'
                nonempty=' '
                ! branch_empty "$name" || nonempty='0'
                remote=' '
                [ -z "$base_remote" ] || remote='l'
                ! has_remote "$name" || remote='r'
                rem_update=' '
-               [ "$remote" != 'r' ] || {
+               [ "$remote" != 'r' ] || ! ref_exists "refs/remotes/$base_remote/top-bases/$name" || {
                        branch_contains "refs/top-bases/$name" "refs/remotes/$base_remote/top-bases/$name" &&
                        branch_contains "$name" "refs/remotes/$base_remote/$name"
                } || rem_update='R'
-               [ "$rem_update" = 'R' ] || branch_contains "refs/remotes/$base_remote/$name" "$name" ||
+               [ "$rem_update" = 'R' ] || branch_contains "refs/remotes/$base_remote/$name" "$name" 2>/dev/null ||
                        rem_update='L'
                deps_update=' '
                needs_update "$name" >/dev/null || deps_update='D'
@@ -45,6 +49,6 @@ git for-each-ref refs/top-bases |
                        subject="(No commits)"
                fi
 
-               printf '%s\t%-31s\t%s\n' "$nonempty$remote$rem_update$deps_update$deps_missing$base_update" \
+               printf '%s\t%-31s\t%s\n' "$current$nonempty$remote$rem_update$deps_update$deps_missing$base_update" \
                        "$name" "$subject"
        done