Skip to content

Commit

Permalink
Merge branch 'jc/maint-log-merge-left-right'
Browse files Browse the repository at this point in the history
* jc/maint-log-merge-left-right:
  Fix "git log --merge --left-right"
  • Loading branch information
Junio C Hamano committed Mar 2, 2008
2 parents 7ab9f8f + e82447b commit d2c425a
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions revision.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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,
Expand Down

0 comments on commit d2c425a

Please sign in to comment.