path: root/t/
diff options
authorJeff King <>2017-03-02 08:23:10 (GMT)
committerJunio C Hamano <>2017-03-02 19:05:04 (GMT)
commit6b145e016aaf512d0026cbd2c78fa28476f043b4 (patch)
tree2035c956b7db744d0bf874458c1c39b9d5d7c4ad /t/
parenta356e8e2a724012c8120bfa69133b6118b1565f4 (diff)
branch: restrict @-expansions when deleting
We use strbuf_branchname() to expand the branch name from the command line, so you can delete the branch given by @{-1}, for example. However, we allow other nonsense like "@", and we do not respect our "-r" flag (so we may end up deleting an oddly-named local ref instead of a remote one). We can fix this by passing the appropriate "allowed" flag to strbuf_branchname(). Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 't/')
1 files changed, 3 insertions, 3 deletions
diff --git a/t/ b/t/
index e671a7a..4f4af1f 100755
--- a/t/
+++ b/t/
@@ -83,7 +83,7 @@ test_expect_success 'delete branch via remote @{upstream}' '
# Note that we create two oddly named local branches here. We want to make
# sure that we do not accidentally delete either of them, even if
# shorten_unambiguous_ref() tweaks the name to avoid ambiguity.
-test_expect_failure 'delete @{upstream} expansion matches -r option' '
+test_expect_success 'delete @{upstream} expansion matches -r option' '
git update-ref refs/remotes/origin/remote-del two &&
git branch --set-upstream-to=origin/remote-del &&
git update-ref refs/heads/origin/remote-del two &&
@@ -94,7 +94,7 @@ test_expect_failure 'delete @{upstream} expansion matches -r option' '
expect_branch refs/heads/remotes/origin/remote-del two
-test_expect_failure 'disallow deleting remote branch via @{-1}' '
+test_expect_success 'disallow deleting remote branch via @{-1}' '
git update-ref refs/remotes/origin/previous one &&
git checkout -b origin/previous two &&
@@ -114,7 +114,7 @@ test_expect_failure 'create branch named "@"' '
expect_branch refs/heads/@ one
-test_expect_failure 'delete branch named "@"' '
+test_expect_success 'delete branch named "@"' '
git update-ref refs/heads/@ two &&
git branch -D @ &&
expect_deleted refs/heads/@