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 107d05fe0e9bdddf8103d369dd7044cda297d7f6..013d241abc09be76c318dbc25d5fb3b40ade7b3a 100644 (file)
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -22,10 +22,6 @@ static void show_one(const char *refname, const struct object_id *oid)
        const char *hex;
        struct object_id peeled;
 
-       /* 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));
@@ -73,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;
                }