Merge branch 'ml/filter-branch-no-op-error' into next

diff --git a/cache.h b/cache.h
index 5593a657aaac8f85309cc5c2dcc4debee64f67d4..4859e2be1a2566687336135bff144155dbcb4551 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1777,6 +1777,8 @@ struct object_info {
 #define OBJECT_INFO_SKIP_CACHED 4
 /* Do not retry packed storage after checking packed and loose storage */
 #define OBJECT_INFO_QUICK 8
+/* Do not check loose object */
+#define OBJECT_INFO_IGNORE_LOOSE 16
 extern int sha1_object_info_extended(const unsigned char *, struct object_info *, unsigned flags);
 
 /*