diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-04 15:51:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-04 15:51:53 -0700 |
| commit | 117374fe3c58cd98ffb56997e70d2de4ce7acdac (patch) | |
| tree | 4eab50f914ddd6200a66cd95f382c931a1ec60e8 /builtin | |
| parent | a211e6712bac61a00f8182a8eedb6683dbe4d31f (diff) | |
| parent | b388e14b89f0a82b8067b3922a93cf2d1b013ff0 (diff) | |
| download | git-117374fe3c58cd98ffb56997e70d2de4ce7acdac.tar.gz | |
Merge branch 'mg/rev-list-count-cherry'
* mg/rev-list-count-cherry:
rev-list --count: separate count for --cherry-mark
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rev-list.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 9bfb94201f..4be66998f6 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -55,7 +55,9 @@ static void show_commit(struct commit *commit, void *data) graph_show_commit(revs->graph); if (revs->count) { - if (commit->object.flags & SYMMETRIC_LEFT) + if (commit->object.flags & PATCHSAME) + revs->count_same++; + else if (commit->object.flags & SYMMETRIC_LEFT) revs->count_left++; else revs->count_right++; @@ -406,8 +408,12 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) &info); if (revs.count) { - if (revs.left_right) + if (revs.left_right && revs.cherry_mark) + printf("%d\t%d\t%d\n", revs.count_left, revs.count_right, revs.count_same); + else if (revs.left_right) printf("%d\t%d\n", revs.count_left, revs.count_right); + else if (revs.cherry_mark) + printf("%d\t%d\n", revs.count_left + revs.count_right, revs.count_same); else printf("%d\n", revs.count_left + revs.count_right); } |