diff options
| author |  Jeff King <peff@peff.net> | 2017-03-02 03:23:14 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-03-02 11:05:04 -0800 |
| commit | 7d5c960bf6f98601dce992f1ffaf4c7ab932e6dc (patch) | |
| tree | e6a326da070df9f1a378400b4e58ef7839653a08 /sha1_name.c | |
| parent | branch: restrict @-expansions when deleting (diff) | |
| download | tgif-7d5c960bf6f98601dce992f1ffaf4c7ab932e6dc.tar.xz | |
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>
Diffstat (limited to 'sha1_name.c')
| -rw-r--r-- | sha1_name.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_name.c b/sha1_name.c index 7f754b60c4..26ceec1d79 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -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) { - strbuf_branchname(sb, name, 0); + strbuf_branchname(sb, name, INTERPRET_BRANCH_LOCAL); if (name[0] == '-') return -1; strbuf_splice(sb, 0, 0, "refs/heads/", 11); |