[PATCH v2 1/4] show-ref: Allow --head to work with --verify
- From
Vladimir Panteleev <git@thecybershadow.net>
- Date
- Jan 21, 2017, 01:08 UTC
- Message-ID
- <20170121010821.25046-2-git@thecybershadow.net>
- In-Reply-To
- <20170121010821.25046-1-git@thecybershadow.net>
Previously, when --verify was specified, show-ref would use a separate code path which ignored --head. Thus, "git show-ref HEAD" used with "--verify" (because the user is not interested in seeing refs/remotes/origin/HEAD), and used with "--head" (because the user does not want HEAD to be filtered out), i.e. "git show-ref --head --verify HEAD", did not work as expected.
Instead of insisting that the input begins with "refs/", allow "HEAD" when "--head" is given 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> --- builtin/show-ref.c | 3 ++- t/t1403-show-ref.sh | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/builtin/show-ref.c b/builtin/show-ref.c index 6d4e66900..945a483e3 100644 --- a/builtin/show-ref.c +++ b/builtin/show-ref.c @@ -202,7 +202,8 @@ 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/") || + (show_head && !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 7e10bcfe3..2fb5dc879 100755 --- a/t/t1403-show-ref.sh +++ b/t/t1403-show-ref.sh @@ -164,4 +164,18 @@ 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 HEAD >actual && + test_cmp expect actual && + + >expect && + + git show-ref --verify --head -q HEAD >actual && + test_cmp expect actual && + + test_must_fail git show-ref --verify --head -q A >actual && + test_cmp expect actual +' + test_done
-- 2.11.0