summaryrefslogtreecommitdiff
path: root/builtin/show-ref.c
diff options
context:
space:
mode:
authorVladimir Panteleev <git@thecybershadow.net>2017-01-23 18:00:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-01-23 20:06:29 (GMT)
commitf1627040b9305dc38994f799c172393909b2c70c (patch)
treef40356f1b99e24683e4013a1beb7009202a5aa85 /builtin/show-ref.c
parentec7c51bc6bda0a836b4955962becedbb702bbc43 (diff)
downloadgit-f1627040b9305dc38994f799c172393909b2c70c.zip
git-f1627040b9305dc38994f799c172393909b2c70c.tar.gz
git-f1627040b9305dc38994f799c172393909b2c70c.tar.bz2
show-ref: allow -d to work with --verify
Move handling of -d into show_one(), so that it takes effect when --verify is present as well as when it is absent. This is useful when the user wishes to avoid the costly iteration of refs. Signed-off-by: Vladimir Panteleev <git@thecybershadow.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/show-ref.c')
-rw-r--r--builtin/show-ref.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index 0e53e3d..a72a626 100644
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -19,19 +19,27 @@ static const char *exclude_existing_arg;
static void show_one(const char *refname, const struct object_id *oid)
{
- const char *hex = find_unique_abbrev(oid->hash, abbrev);
+ const char *hex;
+ struct object_id peeled;
+
+ hex = find_unique_abbrev(oid->hash, abbrev);
if (hash_only)
printf("%s\n", hex);
else
printf("%s %s\n", hex, refname);
+
+ if (!deref_tags)
+ return;
+
+ if (!peel_ref(refname, peeled.hash)) {
+ hex = find_unique_abbrev(peeled.hash, abbrev);
+ printf("%s %s^{}\n", hex, refname);
+ }
}
static int show_ref(const char *refname, const struct object_id *oid,
int flag, void *cbdata)
{
- const char *hex;
- struct object_id peeled;
-
if (show_head && !strcmp(refname, "HEAD"))
goto match;
@@ -79,13 +87,6 @@ match:
show_one(refname, oid);
- if (!deref_tags)
- return 0;
-
- if (!peel_ref(refname, peeled.hash)) {
- hex = find_unique_abbrev(peeled.hash, abbrev);
- printf("%s %s^{}\n", hex, refname);
- }
return 0;
}