diff options
author | Vladimir Panteleev <git@thecybershadow.net> | 2017-01-23 19:00:55 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-01-23 21:06:29 +0100 |
commit | ec7c51bc6bda0a836b4955962becedbb702bbc43 (patch) | |
tree | e79372bdd63d62e8e910007f4a416dfdaf88d20f /builtin | |
parent | Sixth batch for 2.12 (diff) | |
download | git-ec7c51bc6bda0a836b4955962becedbb702bbc43.tar.xz git-ec7c51bc6bda0a836b4955962becedbb702bbc43.zip |
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>
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/show-ref.c | 2 |
1 files changed, 1 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); |