diff options
| -rw-r--r-- | builtin/check-ref-format.c | 3 | ||||
| -rwxr-xr-x | t/t1402-check-ref-format.sh | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c index eac499450f..1e5f9835f0 100644 --- a/builtin/check-ref-format.c +++ b/builtin/check-ref-format.c @@ -39,9 +39,8 @@ static char *collapse_slashes(const char *refname) static int check_ref_format_branch(const char *arg) { struct strbuf sb = STRBUF_INIT; - int nongit; - setup_git_directory_gently(&nongit); + setup_git_directory(); if (strbuf_check_branch_ref(&sb, arg)) die("'%s' is not a valid branch name", arg); printf("%s\n", sb.buf + 11); diff --git a/t/t1402-check-ref-format.sh b/t/t1402-check-ref-format.sh index 0790edf60d..1674b061e2 100755 --- a/t/t1402-check-ref-format.sh +++ b/t/t1402-check-ref-format.sh @@ -161,6 +161,10 @@ test_expect_success 'check-ref-format --branch from subdir' ' test "$refname" = "$sha1" ' +test_expect_success 'check-ref-format --branch from non-repo' ' + test_must_fail nongit git check-ref-format --branch @{-1} +' + valid_ref_normalized() { prereq= case $1 in |