mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
f1627040b9
commit
14144d3b53
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue