Merge branch 'js/rebase-i-redo-exec-fix'

diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index ed888ffa48ce1d5ef80859b8f5b3bf1720e49abd..6a706c02a6f9782ee4abb289cfafe468253aca1f 100644 (file)
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -23,7 +23,7 @@ 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))
+       if (!has_object_file(oid))
                die("git show-ref: bad ref %s (%s)", refname,
                    oid_to_hex(oid));