undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

show-ref: move --quiet handling into show_one()

Browse Source 
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:
Vladimir Panteleev 2017-01-23 18:00:57 +00:00 committed by Junio C Hamano
parent f1627040b9
commit 14144d3b53
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/show-ref.c
View File

@ -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,7 +205,6 @@ 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);
}
else if (!quiet)