diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-26 23:18:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-27 15:42:05 -0800 |
| commit | e82447b1dfbda6ecfc101381c1295c444c73c903 (patch) | |
| tree | a0ed34e150aec9a334a726c3f93ea74121e4e272 | |
| parent | 81fa145917c40b68a5e2cca6afc6a10cdfdbd25b (diff) | |
| download | git-e82447b1dfbda6ecfc101381c1295c444c73c903.tar.gz git-e82447b1dfbda6ecfc101381c1295c444c73c903.tar.xz | |
Fix "git log --merge --left-right"
The command did not reject the combination of these options, but
did not show left/right markers.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | revision.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/revision.c b/revision.c index 6e85aaa3f..a399f2714 100644 --- a/revision.c +++ b/revision.c @@ -749,14 +749,9 @@ static void prepare_show_merge(struct rev_info *revs) add_pending_object(revs, &head->object, "HEAD"); add_pending_object(revs, &other->object, "MERGE_HEAD"); bases = get_merge_bases(head, other, 1); - while (bases) { - struct commit *it = bases->item; - struct commit_list *n = bases->next; - free(bases); - bases = n; - it->object.flags |= UNINTERESTING; - add_pending_object(revs, &it->object, "(merge-base)"); - } + add_pending_commit_list(revs, bases, UNINTERESTING); + free_commit_list(bases); + head->object.flags |= SYMMETRIC_LEFT; if (!active_nr) read_cache(); @@ -775,6 +770,7 @@ static void prepare_show_merge(struct rev_info *revs) i++; } revs->prune_data = prune; + revs->limited = 1; } int handle_revision_arg(const char *arg, struct rev_info *revs, |