Merge branch 'jc/merge-bases'
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2015 20:55:05 +0000 (12:55 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2015 20:55:05 +0000 (12:55 -0800)
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

1  2 
bisect.c
builtin/merge.c
builtin/rev-parse.c
commit.c
commit.h
merge-recursive.c
notes-merge.c
revision.c
sha1_name.c
submodule.c
diff --cc bisect.c
Simple merge
diff --cc builtin/merge.c
Simple merge
Simple merge
diff --cc commit.c
Simple merge
diff --cc commit.h
Simple merge
Simple merge
diff --cc notes-merge.c
Simple merge
diff --cc revision.c
Simple merge
diff --cc sha1_name.c
Simple merge
diff --cc submodule.c
Simple merge