summaryrefslogtreecommitdiff
path: root/builtin/show-ref.c
diff options
context:
space:
mode:
authorVladimir Panteleev <git@thecybershadow.net>2017-01-23 18:00:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-01-23 20:06:29 (GMT)
commit14144d3b53b913b48970aa0947accfe34e745c0f (patch)
tree49e7b4a017d25df8b61a7b510228c646e4883509 /builtin/show-ref.c
parentf1627040b9305dc38994f799c172393909b2c70c (diff)
downloadgit-14144d3b53b913b48970aa0947accfe34e745c0f.zip
git-14144d3b53b913b48970aa0947accfe34e745c0f.tar.gz
git-14144d3b53b913b48970aa0947accfe34e745c0f.tar.bz2
show-ref: move --quiet handling into show_one()
Do the same with --quiet as was done with -d, to remove the need to perform this check at show_one()'s call site from the --verify branch. 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.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index a72a626..ab8e0dc 100644
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -22,6 +22,9 @@ static void show_one(const char *refname, const struct object_id *oid)
const char *hex;
struct object_id peeled;
+ if (quiet)
+ return;
+
hex = find_unique_abbrev(oid->hash, abbrev);
if (hash_only)
printf("%s\n", hex);
@@ -82,9 +85,6 @@ match:
die("git show-ref: bad ref %s (%s)", refname,
oid_to_hex(oid));
- if (quiet)
- return 0;
-
show_one(refname, oid);
return 0;
@@ -205,8 +205,7 @@ int cmd_show_ref(int argc, const char **argv, const char *prefix)
if ((starts_with(*pattern, "refs/") || !strcmp(*pattern, "HEAD")) &&
!read_ref(*pattern, oid.hash)) {
- if (!quiet)
- show_one(*pattern, &oid);
+ show_one(*pattern, &oid);
}
else if (!quiet)
die("'%s' - not a valid ref", *pattern);