mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/merge-bases'

Browse Source 
The get_merge_bases*() API was easy to misuse by careless
copy&paste coders, leaving object flags tainted in the commits that
needed to be traversed.

* jc/merge-bases:
  get_merge_bases(): always clean-up object flags
  bisect: clean flags after checking merge bases
This commit is contained in:
Junio C Hamano
2015-01-07 12:55:05 -08:00
parent 58e0362edd 2ce406ccb8
commit 098501527f
11 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
merge-recursive.c
View File

@ -1901,7 +1901,7 @@ int merge_recursive(struct merge_options *o,
}
if (!ca) {
ca = get_merge_bases(h1, h2, 1);
ca = get_merge_bases(h1, h2);
ca = reverse_commit_list(ca);
}