[PATCH 3/5] branch: delete symref branch, not its target
- From
René Scharfe <rene.scharfe@lsrfire.ath.cx>
- Date
- Oct 18, 2012, 12:05 UTC
- Message-ID
- <507FF07D.8040608@lsrfire.ath.cx>
- In-Reply-To
- <507FEF0B.1060309@lsrfire.ath.cx>
If a branch that is to be deleted happens to be a symref to another branch, the current code removes the targeted branch instead of the one it was called for.
Change this surprising behaviour and delete the symref branch instead.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> --- builtin/branch.c | 2 +- t/t3200-branch.sh | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/builtin/branch.c b/builtin/branch.c index 97c7361..5e1e5b4 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -239,7 +239,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds, continue; } - if (delete_ref(name, sha1, 0)) { + if (delete_ref(name, sha1, REF_NODEREF)) { error(remote_branch ? _("Error deleting remote branch '%s'") : _("Error deleting branch '%s'"), diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 79c8d01..ec5f70e 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -262,6 +262,17 @@ test_expect_success 'config information was renamed, too' \ "test $(git config branch.s.dummy) = Hello && test_must_fail git config branch.s/s/dummy" +test_expect_success 'deleting a symref' ' + git branch target && + git symbolic-ref refs/heads/symref refs/heads/target && + sha1=$(git rev-parse symref | cut -c 1-7) && + echo "Deleted branch symref (was $sha1)." >expect && + git branch -d symref >actual && + test_path_is_file .git/refs/heads/target && + test_path_is_missing .git/refs/heads/symref && + test_i18ncmp expect actual +' + test_expect_success 'renaming a symref is not allowed' \ ' git symbolic-ref refs/heads/master2 refs/heads/master &&
-- 1.7.12