chiark / gitweb /
tg summary: Fix spurious errors on tg-inconsistent remotes
[topgit.git] / tg-summary.sh
index bb71971aad2055c2d7d8388e59b4091dd9650256..4ffebcefda524f434860306779cd541d21477af5 100644 (file)
@@ -29,11 +29,11 @@ git for-each-ref refs/top-bases |
                [ -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'