name-rev: refactor logic to see if a new candidate is a better name

diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index ab8e0dc4142d8f2525641c3bf3f211c142578d9d..013d241abc09be76c318dbc25d5fb3b40ade7b3a 100644 (file)
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -22,6 +22,10 @@ static void show_one(const char *refname, const struct object_id *oid)
        const char *hex;
        struct object_id peeled;
 
+       if (!has_sha1_file(oid->hash))
+               die("git show-ref: bad ref %s (%s)", refname,
+                   oid_to_hex(oid));
+
        if (quiet)
                return;
 
@@ -65,9 +69,6 @@ static int show_ref(const char *refname, const struct object_id *oid,
                                continue;
                        if (len == reflen)
                                goto match;
-                       /* "--verify" requires an exact match */
-                       if (verify)
-                               continue;
                        if (refname[reflen - len - 1] == '/')
                                goto match;
                }
@@ -77,14 +78,6 @@ static int show_ref(const char *refname, const struct object_id *oid,
 match:
        found_match++;
 
-       /* This changes the semantics slightly that even under quiet we
-        * detect and return error if the repository is corrupt and
-        * ref points at a nonexistent object.
-        */
-       if (!has_sha1_file(oid->hash))
-               die("git show-ref: bad ref %s (%s)", refname,
-                   oid_to_hex(oid));
-
        show_one(refname, oid);
 
        return 0;