undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

strbuf_check_ref_format(): expand only local branches

Browse Source 
This function asks strbuf_branchname() to expand any @-marks
in the branchname, and then we blindly stick refs/heads/ in
front of the result. This is obviously nonsense if the
expansion is "HEAD" or a ref in refs/remotes/.

The most obvious end-user effect is that creating or
renaming a branch with an expansion may have confusing
results (e.g., creating refs/heads/origin/master from
"@{upstream}" when the operation should be disallowed).

We can fix this by telling strbuf_branchname() that we are
only interested in local expansions. Any unexpanded bits are
then fed to check_ref_format(), which either disallows them
(in the case of "@{upstream}") or lets them through
("refs/heads/@" is technically valid, if a bit silly).

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:14 -05:00 committed by Junio C Hamano
parent 6b145e016a
commit 7d5c960bf6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sha1_name.c
View File

@ -1319,7 +1319,7 @@ void strbuf_branchname(struct strbuf *sb, const char *name, unsigned allowed)
int strbuf_check_branch_ref(struct strbuf *sb, const char *name) int strbuf_check_branch_ref(struct strbuf *sb, const char *name)
{ {
strbuf_branchname(sb, name, 0); strbuf_branchname(sb, name, INTERPRET_BRANCH_LOCAL);
if (name[0] == '-') if (name[0] == '-')
return -1; return -1;
strbuf_splice(sb, 0, 0, "refs/heads/", 11); strbuf_splice(sb, 0, 0, "refs/heads/", 11);

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

@ -42,7 +42,7 @@ test_expect_success 'update branch via local @{upstream}' '
expect_branch local two expect_branch local two
' '
test_expect_failure 'disallow updating branch via remote @{upstream}' ' test_expect_success 'disallow updating branch via remote @{upstream}' '
git update-ref refs/remotes/origin/remote one && git update-ref refs/remotes/origin/remote one &&
git branch --set-upstream-to=origin/remote && git branch --set-upstream-to=origin/remote &&
@ -109,7 +109,7 @@ test_expect_success 'disallow deleting remote branch via @{-1}' '
# and not refs/heads/HEAD. These tests should not imply that refs/heads/@ is a # and not refs/heads/HEAD. These tests should not imply that refs/heads/@ is a
# sane thing, but it _is_ technically allowed for now. If we disallow it, these # sane thing, but it _is_ technically allowed for now. If we disallow it, these
# can be switched to test_must_fail. # can be switched to test_must_fail.
test_expect_failure 'create branch named "@"' ' test_expect_success 'create branch named "@"' '
git branch -f @ one && git branch -f @ one &&
expect_branch refs/heads/@ one expect_branch refs/heads/@ one
' '