From: Vladimir Panteleev <git@thecybershadow.net>
To: git@vger.kernel.org
Cc: Vladimir Panteleev <git@thecybershadow.net>
Subject: [PATCH v3 3/5] show-ref: Move --quiet handling into show_one
Date: Mon, 23 Jan 2017 18:00:57 +0000 [thread overview]
Message-ID: <20170123180059.4288-4-git@thecybershadow.net> (raw)
In-Reply-To: <20170123180059.4288-1-git@thecybershadow.net>
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>
---
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
next prev parent 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 ` [PATCH v3 1/5] show-ref: Accept HEAD " Vladimir Panteleev
2017-01-23 18:00 ` [PATCH v3 2/5] show-ref: Allow -d to work " Vladimir Panteleev
2017-01-23 18:00 ` Vladimir Panteleev [this message]
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-4-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.