diff options
| author |  Jeff King <peff@peff.net> | 2017-03-02 03:23:10 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-03-02 11:05:04 -0800 |
| commit | 6b145e016aaf512d0026cbd2c78fa28476f043b4 (patch) | |
| tree | 2035c956b7db744d0bf874458c1c39b9d5d7c4ad /t | |
| parent | t3204: test git-branch @-expansion corner cases (diff) | |
| download | tgif-6b145e016aaf512d0026cbd2c78fa28476f043b4.tar.xz | |
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3204-branch-name-interpretation.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t3204-branch-name-interpretation.sh b/t/t3204-branch-name-interpretation.sh index e671a7a644..4f4af1fb46 100755 --- a/t/t3204-branch-name-interpretation.sh +++ b/t/t3204-branch-name-interpretation.sh @@ -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/@ |