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@xxxxxxxxxxxxxxxxxx>
---
builtin/show-ref.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index a72a626b1..ab8e0dc41 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 @@ static int show_ref(const char *refname, const struct object_id *oid,
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);
--
2.11.0