All of lore.kernel.org
 help / color / mirror / Atom feed
From: Vladimir Panteleev <git@thecybershadow.net>
To: git@vger.kernel.org
Cc: Vladimir Panteleev <git@thecybershadow.net>
Subject: [PATCH v3 1/5] show-ref: Accept HEAD with --verify
Date: Mon, 23 Jan 2017 18:00:55 +0000	[thread overview]
Message-ID: <20170123180059.4288-2-git@thecybershadow.net> (raw)
In-Reply-To: <20170123180059.4288-1-git@thecybershadow.net>

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>
---
 builtin/show-ref.c  |  2 +-
 t/t1403-show-ref.sh | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index 6d4e66900..0e53e3da4 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 7e10bcfe3..5932beada 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
-- 
2.11.0


  reply	other threads:[~2017-01-23 18:01 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-23 18:00 [PATCH v3 0/5] show-ref: Allow -d, --head to work with --verify Vladimir Panteleev
2017-01-23 18:00 ` Vladimir Panteleev [this message]
2017-01-23 18:00 ` [PATCH v3 2/5] show-ref: Allow -d " Vladimir Panteleev
2017-01-23 18:00 ` [PATCH v3 3/5] show-ref: Move --quiet handling into show_one Vladimir Panteleev
2017-01-23 18:00 ` [PATCH v3 4/5] show-ref: Detect dangling refs under --verify as well Vladimir Panteleev
2017-01-24  2:48   ` Junio C Hamano
2017-01-23 18:00 ` [PATCH v3 5/5] show-ref: Remove dead `if (verify)' check Vladimir Panteleev
2017-01-23 20:03 ` [PATCH v3 0/5] show-ref: Allow -d, --head to work with --verify Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170123180059.4288-2-git@thecybershadow.net \
    --to=git@thecybershadow.net \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.