summaryrefslogtreecommitdiff
path: root/builtin-branch.c
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 /builtin-branch.c
parent71dfbf224ff980f4085f75868dc409118418731e (diff)
downloadgit-03840fc32d783be6750bf7e41a89687b8c3053eb.tar.gz
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 'builtin-branch.c')
-rw-r--r--builtin-branch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-branch.c b/builtin-branch.c
index d3df5a57f1..020ed6be7b 100644
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -134,7 +134,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds)
*/
if (!force &&
- !in_merge_bases(rev, head_rev)) {
+ !in_merge_bases(rev, &head_rev, 1)) {
error("The branch '%s' is not a strict subset of "
"your current HEAD.\n"
"If you are sure you want to delete it, "