summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorRene Scharfe <rene.scharfe@lsrfire.ath.cx>2006-07-01 23:29:26 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-02 01:13:25 (GMT)
commit31609c17251f368584f7b94d44b06194112b4251 (patch)
tree5ce49fdf0575f1716310b52b94db51f308ee891c /commit.h
parent7c6f8aaf6d795f0c9a75671acceb9754ea06fd81 (diff)
downloadgit-31609c17251f368584f7b94d44b06194112b4251.zip
git-31609c17251f368584f7b94d44b06194112b4251.tar.gz
git-31609c17251f368584f7b94d44b06194112b4251.tar.bz2
Add get_merge_bases_clean()
Add get_merge_bases_clean(), a wrapper for get_merge_bases() that cleans up after doing its work and make get_merge_bases() NOT clean up. Single-shot programs like git-merge-base can use the dirty and fast version. Also move the object flags used in get_merge_bases() out of the range defined in revision.h. This fixes the "66ae0c77...ced9456a 89719209...262a6ef7" test of the ... operator which is introduced with the next patch. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/commit.h b/commit.h
index 89b9dad..3a26e29 100644
--- a/commit.h
+++ b/commit.h
@@ -106,5 +106,6 @@ int register_commit_graft(struct commit_graft *, int);
int read_graft_file(const char *graft_file);
extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2);
+extern struct commit_list *get_merge_bases_clean(struct commit *rev1, struct commit *rev2);
#endif /* COMMIT_H */