summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-27 07:18:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-27 23:42:05 (GMT)
commite82447b1dfbda6ecfc101381c1295c444c73c903 (patch)
treea0ed34e150aec9a334a726c3f93ea74121e4e272
parent81fa145917c40b68a5e2cca6afc6a10cdfdbd25b (diff)
downloadgit-e82447b1dfbda6ecfc101381c1295c444c73c903.zip
git-e82447b1dfbda6ecfc101381c1295c444c73c903.tar.gz
git-e82447b1dfbda6ecfc101381c1295c444c73c903.tar.bz2
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.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/revision.c b/revision.c
index 6e85aaa..a399f27 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,