summaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-01-07 12:55:05 -0800
committerJunio C Hamano <gitster@pobox.com>2015-01-07 12:55:05 -0800
commit098501527f2b5628f086d3d9d2fda87220c069a5 (patch)
treed5874ea1c3185a6baa71719ff20e89ad57e53b46 /notes-merge.c
parent58e0362eddba1678a71c8990862053ff989527b6 (diff)
parent2ce406ccb85c4546b6d19309a6101b37c7bd952e (diff)
downloadgit-098501527f2b5628f086d3d9d2fda87220c069a5.tar.gz
Merge branch 'jc/merge-bases'
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
Diffstat (limited to 'notes-merge.c')
-rw-r--r--notes-merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/notes-merge.c b/notes-merge.c
index 7eb9d7a010..109ff4ef41 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -594,7 +594,7 @@ int notes_merge(struct notes_merge_options *o,
assert(local && remote);
/* Find merge bases */
- bases = get_merge_bases(local, remote, 1);
+ bases = get_merge_bases(local, remote);
if (!bases) {
base_sha1 = null_sha1;
base_tree_sha1 = EMPTY_TREE_SHA1_BIN;