summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-08 10:11:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-08 10:11:37 (GMT)
commit925ca887b8ade2a5de6b50652008d0ee1fff3215 (patch)
tree50a37487e54b065c4df14a2452aa155aa657b6ae /revision.c
parentca2c19503cdd5a603024665bee8e9e8533431c9a (diff)
parente82447b1dfbda6ecfc101381c1295c444c73c903 (diff)
downloadgit-925ca887b8ade2a5de6b50652008d0ee1fff3215.zip
git-925ca887b8ade2a5de6b50652008d0ee1fff3215.tar.gz
git-925ca887b8ade2a5de6b50652008d0ee1fff3215.tar.bz2
Merge branch 'jc/maint-log-merge-left-right' into maint
* jc/maint-log-merge-left-right: Fix "git log --merge --left-right"
Diffstat (limited to 'revision.c')
-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,