diff options
| author | Jeff King <peff@peff.net> | 2017-03-02 09:23:10 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-02 20:05:04 +0100 |
| commit | 6b145e016aaf512d0026cbd2c78fa28476f043b4 (patch) | |
| tree | 2035c956b7db744d0bf874458c1c39b9d5d7c4ad | |
| parent | t3204: test git-branch @-expansion corner cases (diff) | |
| download | git-6b145e016aaf512d0026cbd2c78fa28476f043b4.tar.xz git-6b145e016aaf512d0026cbd2c78fa28476f043b4.zip | |
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>
| -rw-r--r-- | builtin/branch.c | 5 | ||||
| -rwxr-xr-x | t/t3204-branch-name-interpretation.sh | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 5aab33ab58..0c924612eb 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -190,17 +190,20 @@ static int delete_branches(int argc, const char **argv, int force, int kinds, int ret = 0; int remote_branch = 0; struct strbuf bname = STRBUF_INIT; + unsigned allowed_interpret; switch (kinds) { case FILTER_REFS_REMOTES: fmt = "refs/remotes/%s"; /* For subsequent UI messages */ remote_branch = 1; + allowed_interpret = INTERPRET_BRANCH_REMOTE; force = 1; break; case FILTER_REFS_BRANCHES: fmt = "refs/heads/%s"; + allowed_interpret = INTERPRET_BRANCH_LOCAL; break; default: die(_("cannot use -a with -d")); @@ -215,7 +218,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds, char *target = NULL; int flags = 0; - strbuf_branchname(&bname, argv[i], 0); + strbuf_branchname(&bname, argv[i], allowed_interpret); free(name); name = mkpathdup(fmt, bname.buf); 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/@ |