chiark / gitweb /
tg summary: 'L' denotes that push will update remote mate
authorPetr Baudis <pasky@suse.cz>
Tue, 9 Sep 2008 19:51:48 +0000 (21:51 +0200)
committerPetr Baudis <pasky@suse.cz>
Tue, 9 Sep 2008 19:51:59 +0000 (21:51 +0200)
README
tg-summary.sh

diff --git a/README b/README
index cc200cae41b7695b91e1cc768bf905c2b9ef764f..9df3699d765e8242b4b5f24075aa6d500b3753f1 100644 (file)
--- a/README
+++ b/README
@@ -267,6 +267,8 @@ tg summary
 ~~~~~~~~~~
        Show overview of all TopGit-tracked topic branches and their
        up-to-date status ('0' marks that it introduces no own changes,
 ~~~~~~~~~~
        Show overview of all TopGit-tracked topic branches and their
        up-to-date status ('0' marks that it introduces no own changes,
+       'l'/'r' marks that it is local-only or has remote mate,
+       'L'/'R' marks that it is ahead/out-of-date wrt. its remote mate,
        'D' marks that it is out-of-date wrt. its dependencies,
        '!' marks that it has missing dependencies (even recursively),
        'B' marks that it is out-of-date wrt. its base).
        'D' marks that it is out-of-date wrt. its dependencies,
        '!' marks that it has missing dependencies (even recursively),
        'B' marks that it is out-of-date wrt. its base).
index 1d679c44078587ee9ba3c267320ec66932b59f5d..8616d074dc6f392f9ec1df1533339bfa6ffdc021 100644 (file)
@@ -29,6 +29,8 @@ git for-each-ref refs/top-bases |
                        branch_contains "refs/top-bases/$name" "refs/remotes/$base_remote/top-bases/$name" &&
                        branch_contains "$name" "refs/remotes/$base_remote/$name"
                } || rem_update='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'
+               [ "$rem_update" = 'R' ] || branch_contains "refs/remotes/$base_remote/$name" "$name" ||
+                       rem_update='L'
                deps_update=' '
                needs_update "$name" >/dev/null || deps_update='D'
                deps_missing=' '
                deps_update=' '
                needs_update "$name" >/dev/null || deps_update='D'
                deps_missing=' '