diff options
| author | Vladimir Panteleev <git@thecybershadow.net> | 2017-01-23 18:00:55 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-23 12:06:29 -0800 |
| commit | ec7c51bc6bda0a836b4955962becedbb702bbc43 (patch) | |
| tree | e79372bdd63d62e8e910007f4a416dfdaf88d20f | |
| parent | 787f75f0567aa8c7347544c65e9d3bc6640a27d4 (diff) | |
| download | git-ec7c51bc6bda0a836b4955962becedbb702bbc43.tar.gz | |
show-ref: accept HEAD with --verify
Previously, when --verify was specified, show-ref would use a separate
code path which did not handle HEAD and treated it as an invalid
ref. Thus, "git show-ref --verify HEAD" (where "--verify" is used
because the user is not interested in seeing refs/remotes/origin/HEAD)
did not work as expected.
Instead of insisting that the input begins with "refs/", allow "HEAD"
as well in the codepath that handles "--verify", so that all valid
full refnames including HEAD are passed to the same output machinery.
Signed-off-by: Vladimir Panteleev <git@thecybershadow.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/show-ref.c | 2 | ||||
| -rwxr-xr-x | t/t1403-show-ref.sh | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/builtin/show-ref.c b/builtin/show-ref.c index 6d4e669002..0e53e3da4f 100644 --- a/builtin/show-ref.c +++ b/builtin/show-ref.c @@ -202,7 +202,7 @@ int cmd_show_ref(int argc, const char **argv, const char *prefix) while (*pattern) { struct object_id oid; - if (starts_with(*pattern, "refs/") && + if ((starts_with(*pattern, "refs/") || !strcmp(*pattern, "HEAD")) && !read_ref(*pattern, oid.hash)) { if (!quiet) show_one(*pattern, &oid); diff --git a/t/t1403-show-ref.sh b/t/t1403-show-ref.sh index 7e10bcfe39..5932beada1 100755 --- a/t/t1403-show-ref.sh +++ b/t/t1403-show-ref.sh @@ -164,4 +164,15 @@ test_expect_success 'show-ref --heads, --tags, --head, pattern' ' test_cmp expect actual ' +test_expect_success 'show-ref --verify HEAD' ' + echo $(git rev-parse HEAD) HEAD >expect && + git show-ref --verify HEAD >actual && + test_cmp expect actual && + + >expect && + + git show-ref --verify -q HEAD >actual && + test_cmp expect actual +' + test_done |