mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-13 20:53:02 +01:00
Code Activity

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

Browse source 
* jc/maint-log-merge-left-right:
  Fix "git log --merge --left-right"
This commit is contained in:
Junio C Hamano 2008-03-08 02:11:37 -08:00
commit 925ca887b8
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

@ -749,14 +749,9 @@ static void prepare_show_merge(struct rev_info *revs)
add_pending_object(revs, &head->object, "HEAD"); add_pending_object(revs, &head->object, "HEAD");
add_pending_object(revs, &other->object, "MERGE_HEAD"); add_pending_object(revs, &other->object, "MERGE_HEAD");
bases = get_merge_bases(head, other, 1); bases = get_merge_bases(head, other, 1);
while (bases) { add_pending_commit_list(revs, bases, UNINTERESTING);
struct commit *it = bases->item; free_commit_list(bases);
struct commit_list *n = bases->next; head->object.flags |= SYMMETRIC_LEFT;
free(bases);
bases = n;
it->object.flags |= UNINTERESTING;
add_pending_object(revs, &it->object, "(merge-base)");
}
if (!active_nr) if (!active_nr)
read_cache(); read_cache();
@ -775,6 +770,7 @@ static void prepare_show_merge(struct rev_info *revs)
i++; i++;
} }
revs->prune_data = prune; revs->prune_data = prune;
revs->limited = 1;
} }
int handle_revision_arg(const char *arg, struct rev_info *revs, int handle_revision_arg(const char *arg, struct rev_info *revs,