@matheusbsbs / matheus-bagliano / commits / 7d5c960bf6

strbuf_check_ref_format(): expand only local branches

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>

Jeff King committed Mar 2, 2017 at 03:23 UTC 7d5c960bf6f98601dce992f1ffaf4c7ab932e6dc

2 files changed +3 -3

sha1_name.c

+1 -1

@@ -1319,7 +1319,7 @@ void strbuf_branchname(struct strbuf *sb, const char *name, unsigned allowed)

1319

1320 int strbuf_check_branch_ref(struct strbuf *sb, const char *name)

1321 {

1322 - strbuf_branchname(sb, name, 0);

1322 + strbuf_branchname(sb, name, INTERPRET_BRANCH_LOCAL);

1323 if (name[0] == '-')

1324 return -1;

1325 strbuf_splice(sb, 0, 0, "refs/heads/", 11);

t/t3204-branch-name-interpretation.sh

+2 -2

@@ -42,7 +42,7 @@ test_expect_success 'update branch via local @{upstream}' '

42 expect_branch local two

43 '

45 -test_expect_failure 'disallow updating branch via remote @{upstream}' '

45 +test_expect_success 'disallow updating branch via remote @{upstream}' '

46 git update-ref refs/remotes/origin/remote one &&

47 git branch --set-upstream-to=origin/remote &&

@@ -109,7 +109,7 @@ test_expect_success 'disallow deleting remote branch via @{-1}' '

109 # and not refs/heads/HEAD. These tests should not imply that refs/heads/@ is a

110 # sane thing, but it _is_ technically allowed for now. If we disallow it, these

111 # can be switched to test_must_fail.

112 -test_expect_failure 'create branch named "@"' '

112 +test_expect_success 'create branch named "@"' '

113 git branch -f @ one &&

114 expect_branch refs/heads/@ one

115 '