aboutsummaryrefslogtreecommitdiff
path: root/commit.h
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 /commit.h
parent58e0362eddba1678a71c8990862053ff989527b6 (diff)
parent2ce406ccb85c4546b6d19309a6101b37c7bd952e (diff)
downloadgit-098501527f2b5628f086d3d9d2fda87220c069a5.tar.gz
git-098501527f2b5628f086d3d9d2fda87220c069a5.tar.xz
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 'commit.h')
-rw-r--r--commit.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/commit.h b/commit.h
index cd35ac150..5cc1e7ec9 100644
--- a/commit.h
+++ b/commit.h
@@ -236,10 +236,13 @@ struct commit_graft *read_graft_line(char *buf, int len);
int register_commit_graft(struct commit_graft *, int);
struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
-extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
-extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos, int cleanup);
+extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2);
+extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos);
extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
+/* To be used only when object flags after this call no longer matter */
+extern struct commit_list *get_merge_bases_many_dirty(struct commit *one, int n, struct commit **twos);
+
/* largest positive number a signed 32-bit integer can contain */
#define INFINITE_DEPTH 0x7fffffff