show-ref --verify: accept pseudorefs

"git show-ref --verify" is useful for scripts that want to look up a
fully qualified refname without falling back to the DWIM rules used by
"git rev-parse" rules when the ref does not exist. Currently it will
only accept "HEAD" or a refname beginning with "refs/". Running

    git show-ref --verify CHERRY_PICK_HEAD

will always result in

    fatal: 'CHERRY_PICK_HEAD' - not a valid ref

even when CHERRY_PICK_HEAD exists. By calling refname_is_safe() instead
of comparing the refname to "HEAD" we can accept all one-level refs that
contain only uppercase ascii letters and underscores.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index 79955c2856eacea0398a7fd9e90f34c790bbd8cd..1c15421e6008e80b1983c168592998f17667bf58 100644 (file)
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -172,7 +172,7 @@ static int cmd_show_ref__verify(const struct show_one_options *show_one_opts,
        while (*refs) {
                struct object_id oid;
 
-               if ((starts_with(*refs, "refs/") || !strcmp(*refs, "HEAD")) &&
+               if ((starts_with(*refs, "refs/") || refname_is_safe(*refs)) &&
                    !read_ref(*refs, &oid)) {
                        show_one(show_one_opts, *refs, &oid);
                }

diff --git a/t/t1403-show-ref.sh b/t/t1403-show-ref.sh
index d0a8f7b121cd874562fbf0759670520f4b275b30..33fb7a38ffff849db2a825de61eacbc34a8eb11d 100755 (executable)
--- a/t/t1403-show-ref.sh
+++ b/t/t1403-show-ref.sh
@@ -174,6 +174,14 @@ test_expect_success 'show-ref --verify HEAD' '
        test_must_be_empty actual
 '
 
+test_expect_success 'show-ref --verify pseudorefs' '
+       git update-ref CHERRY_PICK_HEAD HEAD $ZERO_OID &&
+       test_when_finished "git update-ref -d CHERRY_PICK_HEAD" &&
+       git show-ref -s --verify HEAD >actual &&
+       git show-ref -s --verify CHERRY_PICK_HEAD >expect &&
+       test_cmp actual expect
+'
+
 test_expect_success 'show-ref --verify with dangling ref' '
        sha1_file() {
                echo "$*" | sed "s#..#.git/objects/&/#"