aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-02 15:12:04 -0800
committerJunio C Hamano <gitster@pobox.com>2008-03-02 15:12:04 -0800
commitd2c425aa2bb8543ea08ca44b04ffacc972a7ad61 (patch)
tree4ea68669f6463cbc7b7be21b25b5a7f1ae0dccf1
parent7ab9f8f8b12853d4cb0e45031bf2ee9a0517ad22 (diff)
parente82447b1dfbda6ecfc101381c1295c444c73c903 (diff)
downloadgit-d2c425aa2bb8543ea08ca44b04ffacc972a7ad61.tar.gz
git-d2c425aa2bb8543ea08ca44b04ffacc972a7ad61.tar.xz
Merge branch 'jc/maint-log-merge-left-right'
* jc/maint-log-merge-left-right: Fix "git log --merge --left-right"
-rw-r--r--revision.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/revision.c b/revision.c
index 0eb6faa53..63bf2c5c2 100644
--- a/revision.c
+++ b/revision.c
@@ -772,14 +772,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();
@@ -798,6 +793,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,