mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-24 21:16:10 +02:00
Code

Merge branch 'jc/maint-log-merge-left-right' 

* jc/maint-log-merge-left-right:
  Fix "git log --merge --left-right"
This commit is contained in:
Junio C Hamano 2008-03-02 15:12:04 -08:00
parent 7ab9f8f8b1 e82447b1df
commit d2c425aa2b
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
revision.c
View File

@ -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,