Merge tag 'v2.9.5' into maint-2.10

diff --git a/sha1_file.c b/sha1_file.c
index 7a4f8f8661a94ed9381e1297118c0de9e90c8c97..727a9769fb7549e365e66f4ecb65f8e665898a96 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -3231,6 +3231,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;