mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

branch: restrict @-expansions when deleting

Browse Source 
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>
This commit is contained in:
Jeff King
2017-03-02 03:23:10 -05:00
committed by Junio C Hamano
parent a356e8e2a7
commit 6b145e016a
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/branch.c
View File

@ -190,17 +190,20 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
int ret = 0; int ret = 0;
int remote_branch = 0; int remote_branch = 0;
struct strbuf bname = STRBUF_INIT; struct strbuf bname = STRBUF_INIT;
unsigned allowed_interpret;
switch (kinds) { switch (kinds) {
case FILTER_REFS_REMOTES: case FILTER_REFS_REMOTES:
fmt = "refs/remotes/%s"; fmt = "refs/remotes/%s";
/* For subsequent UI messages */ /* For subsequent UI messages */
remote_branch = 1; remote_branch = 1;
allowed_interpret = INTERPRET_BRANCH_REMOTE;
force = 1; force = 1;
break; break;
case FILTER_REFS_BRANCHES: case FILTER_REFS_BRANCHES:
fmt = "refs/heads/%s"; fmt = "refs/heads/%s";
allowed_interpret = INTERPRET_BRANCH_LOCAL;
break; break;
default: default:
die(_("cannot use -a with -d")); 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; char *target = NULL;
int flags = 0; int flags = 0;
strbuf_branchname(&bname, argv[i], 0); strbuf_branchname(&bname, argv[i], allowed_interpret);
free(name); free(name);
name = mkpathdup(fmt, bname.buf); name = mkpathdup(fmt, bname.buf);

6
t/t3204-branch-name-interpretation.sh
View File

@ -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 # 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 # sure that we do not accidentally delete either of them, even if
# shorten_unambiguous_ref() tweaks the name to avoid ambiguity. # 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 update-ref refs/remotes/origin/remote-del two &&
git branch --set-upstream-to=origin/remote-del && git branch --set-upstream-to=origin/remote-del &&
git update-ref refs/heads/origin/remote-del two && 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 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 update-ref refs/remotes/origin/previous one &&
git checkout -b origin/previous two && git checkout -b origin/previous two &&
@ -114,7 +114,7 @@ test_expect_failure 'create branch named "@"' '
expect_branch refs/heads/@ one expect_branch refs/heads/@ one
' '
test_expect_failure 'delete branch named "@"' ' test_expect_success 'delete branch named "@"' '
git update-ref refs/heads/@ two && git update-ref refs/heads/@ two &&
git branch -D @ && git branch -D @ &&
expect_deleted refs/heads/@ expect_deleted refs/heads/@