aboutsummaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-08 23:22:31 -0800
committerJunio C Hamano <junkio@cox.net>2007-01-09 17:57:03 -0800
commit03840fc32d783be6750bf7e41a89687b8c3053eb (patch)
tree8653bc787e3eee04d2fad107b32c1fe12e7fe05f /commit.h
parent71dfbf224ff980f4085f75868dc409118418731e (diff)
downloadgit-03840fc32d783be6750bf7e41a89687b8c3053eb.tar.gz
git-03840fc32d783be6750bf7e41a89687b8c3053eb.tar.xz
Allow in_merge_bases() to take more than one reference commits.
The internal function in_merge_bases(A, B) is used to make sure that commit A is an ancestor of commit B. This changes the signature of it to take an array of B's and updates its current callers. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/commit.h b/commit.h
index 936f8fce3..b8e6e18a8 100644
--- a/commit.h
+++ b/commit.h
@@ -114,5 +114,5 @@ extern int is_repository_shallow();
extern struct commit_list *get_shallow_commits(struct object_array *heads,
int depth, int shallow_flag, int not_shallow_flag);
-int in_merge_bases(struct commit *rev1, struct commit *rev2);
+int in_merge_bases(struct commit *, struct commit **, int);
#endif /* COMMIT_H */