diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-22 21:38:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-22 21:38:50 -0700 |
| commit | aeb2aaa7712f7af8237d5bceb725a7db8c2d4620 (patch) | |
| tree | 179be08e021c12d073818ca78bc63846b10da8a5 /builtin/rev-list.c | |
| parent | 281ee1d0c2c3f73bdc9012a5ac52feff97f72acd (diff) | |
| parent | b1b47554ae889ca76b66349819c9b95a8be5f646 (diff) | |
| download | git-aeb2aaa7712f7af8237d5bceb725a7db8c2d4620.tar.gz | |
Merge branch 'mg/rev-list-one-side-only'
* mg/rev-list-one-side-only:
git-log: put space after commit mark
t6007: test rev-list --cherry
log --cherry: a synonym
rev-list: documentation and test for --cherry-mark
revision.c: introduce --cherry-mark
rev-list/log: factor out revision mark generation
rev-list: --left/right-only are mutually exclusive
rev-list: documentation and test for --left/right-only
t6007: Make sure we test --cherry-pick
revlist.c: introduce --left/right-only for unsymmetric picking
Diffstat (limited to 'builtin/rev-list.c')
| -rw-r--r-- | builtin/rev-list.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/builtin/rev-list.c b/builtin/rev-list.c index ba27d39f97..f458cb7587 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -64,18 +64,8 @@ static void show_commit(struct commit *commit, void *data) if (info->header_prefix) fputs(info->header_prefix, stdout); - if (!revs->graph) { - if (commit->object.flags & BOUNDARY) - putchar('-'); - else if (commit->object.flags & UNINTERESTING) - putchar('^'); - else if (revs->left_right) { - if (commit->object.flags & SYMMETRIC_LEFT) - putchar('<'); - else - putchar('>'); - } - } + if (!revs->graph) + fputs(get_revision_mark(revs, commit), stdout); if (revs->abbrev_commit && revs->abbrev) fputs(find_unique_abbrev(commit->object.sha1, revs->abbrev), stdout); |