Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Add RelNotes 1.5.1
[gitweb.git]
/
builtin-branch.c
diff --git
a/builtin-branch.c
b/builtin-branch.c
index 2d8d61b453ede72b8d0319cb192f9f06a024d8c0..d0e720936846355b1ba8937cea9c2a14e5b8856a 100644
(file)
--- 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, "