Merge branch 'tk/diffcore-delta-remove-unused' into maint

diff --git a/cache.h b/cache.h
index 4cba08ecb1096dfdbcaae0eb82adad4a7825d35d..1ec9021a70083ea40ee21add8ba766ea9b9c5e25 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1123,6 +1123,7 @@ static inline int has_sha1_file(const unsigned char *sha1)
 
 /* Same as the above, except for struct object_id. */
 extern int has_object_file(const struct object_id *oid);
+extern int has_object_file_with_flags(const struct object_id *oid, int flags);
 
 /*
  * Return true iff an alternate object database has a loose object