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>
Junio C Hamano committed
Feb 26, 2008 at 23:18 UTC
e82447b1dfbda6ecfc101381c1295c444c73c903
1 file changed
+4
-8
revision.c
+4
-8
@@ -749,14 +749,9 @@ static void prepare_show_merge(struct rev_info *revs)
749
add_pending_object(revs, &head->object, "HEAD");
750
add_pending_object(revs, &other->object, "MERGE_HEAD");
751
bases = get_merge_bases(head, other, 1);
752
- while (bases) {
753
- struct commit *it = bases->item;
754
- struct commit_list *n = bases->next;
755
- free(bases);
756
- bases = n;
757
- it->object.flags |= UNINTERESTING;
758
- add_pending_object(revs, &it->object, "(merge-base)");
759
- }
752
+ add_pending_commit_list(revs, bases, UNINTERESTING);
753
+ free_commit_list(bases);
754
+ head->object.flags |= SYMMETRIC_LEFT;
755
756
if (!active_nr)
757
read_cache();
@@ -775,6 +770,7 @@ static void prepare_show_merge(struct rev_info *revs)
770
i++;
771
}
772
revs->prune_data = prune;
773
+ revs->limited = 1;
774
}
775
776
int handle_revision_arg(const char *arg, struct rev_info *revs,