diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-11-06 14:24:28 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-06 14:24:28 +0900 |
| commit | 5a74ce22e61ce0c8d7325b891ef1a926cf4f6154 (patch) | |
| tree | 7c4c6d967be2268e7163e861f44c493642af42a8 /builtin | |
| parent | Merge branch 'jc/t5601-copy-workaround' (diff) | |
| parent | check-ref-format doc: --branch validates and expands <branch> (diff) | |
| download | tgif-5a74ce22e61ce0c8d7325b891ef1a926cf4f6154.tar.xz | |
Merge branch 'jc/check-ref-format-oor'
"git check-ref-format --branch @{-1}" bit a "BUG()" when run
outside a repository for obvious reasons; clarify the documentation
and make sure we do not even try to expand the at-mark magic in
such a case, but still call the validation logic for branch names.
* jc/check-ref-format-oor:
check-ref-format doc: --branch validates and expands <branch>
check-ref-format --branch: strip refs/heads/ using skip_prefix
check-ref-format --branch: do not expand @{...} outside repository
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/check-ref-format.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c index 6c40ff110b..bc67d3f0a8 100644 --- a/builtin/check-ref-format.c +++ b/builtin/check-ref-format.c @@ -39,12 +39,14 @@ static char *collapse_slashes(const char *refname) static int check_ref_format_branch(const char *arg) { struct strbuf sb = STRBUF_INIT; + const char *name; int nongit; setup_git_directory_gently(&nongit); - if (strbuf_check_branch_ref(&sb, arg)) + if (strbuf_check_branch_ref(&sb, arg) || + !skip_prefix(sb.buf, "refs/heads/", &name)) die("'%s' is not a valid branch name", arg); - printf("%s\n", sb.buf + 11); + printf("%s\n", name); strbuf_release(&sb); return 0; } |