Merge branch 'lt/abbrev-auto'

diff --git a/sha1_file.c b/sha1_file.c
index 266152de36a099bfa75bfaa8429f0234c52a80b1..2eda9291ee307127bdd715f0540994464534429d 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -3335,6 +3335,11 @@ int has_object_file(const struct object_id *oid)
        return has_sha1_file(oid->hash);
 }
 
+int has_object_file_with_flags(const struct object_id *oid, int flags)
+{
+       return has_sha1_file_with_flags(oid->hash, flags);
+}
+
 static void check_tree(const void *buf, size_t size)
 {
        struct tree_desc desc;