diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-14 00:50:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-14 00:54:35 (GMT) |
| commit | 4a164d48df6bb1b4a771741c63d4437fd2dca0bb (patch) | |
| tree | 73e3b0ca16e8ea83e9f761af476736c29b24caf9 /builtin-branch.c | |
| parent | f8f2aaa17297d6b21c84641edc2f6135575a003c (diff) | |
| parent | 03840fc32d783be6750bf7e41a89687b8c3053eb (diff) | |
| download | git-4a164d48df6bb1b4a771741c63d4437fd2dca0bb.zip git-4a164d48df6bb1b4a771741c63d4437fd2dca0bb.tar.gz git-4a164d48df6bb1b4a771741c63d4437fd2dca0bb.tar.bz2 | |
Merge branch 'jc/merge-base' (early part)
This contains an evil merge to fast-import, in order to
resolve in_merge_bases() update.
Diffstat (limited to 'builtin-branch.c')
| -rw-r--r-- | builtin-branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-branch.c b/builtin-branch.c index 2d8d61b..d0e7209 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, " |