X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg-summary.sh;h=1d679c44078587ee9ba3c267320ec66932b59f5d;hp=57c723a4da66812fbfd8fd8d399ddbd2747b072b;hb=ef028024666dde5fdc3afb8c348e75e2c37dd603;hpb=cbb268fc6209a9d73fa9373c4e677fef327030a4 diff --git a/tg-summary.sh b/tg-summary.sh index 57c723a..1d679c4 100644 --- a/tg-summary.sh +++ b/tg-summary.sh @@ -21,6 +21,14 @@ git for-each-ref refs/top-bases | nonempty=' ' ! branch_empty "$name" || nonempty='0' + remote=' ' + [ -z "$base_remote" ] || remote='l' + ! has_remote "$name" || remote='r' + rem_update=' ' + [ "$remote" != 'r' ] || { + branch_contains "refs/top-bases/$name" "refs/remotes/$base_remote/top-bases/$name" && + branch_contains "$name" "refs/remotes/$base_remote/$name" + } || rem_update='R' deps_update=' ' needs_update "$name" >/dev/null || deps_update='D' deps_missing=' ' @@ -35,6 +43,6 @@ git for-each-ref refs/top-bases | subject="(No commits)" fi - printf '%s\t%-31s\t%s\n' "$nonempty$deps_update$deps_missing$base_update" \ + printf '%s\t%-31s\t%s\n' "$nonempty$remote$rem_update$deps_update$deps_missing$base_update" \ "$name" "$subject" done