Merge branch 'jc/check-attr-honor-working-tree'

diff --git a/diffcore.h b/diffcore.h
index 1315cfd4ef0fbe0aeb0cae9a14bf09fd53212124..92788ee4de8e59068a204729a8d6f7f89aaa6ee6 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -111,6 +111,20 @@ extern void diffcore_merge_broken(void);
 extern void diffcore_pickaxe(struct diff_options *);
 extern void diffcore_order(const char *orderfile);
 
+/* low-level interface to diffcore_order */
+struct obj_order {
+       void *obj;      /* setup by caller */
+
+       /* setup/used by order_objects() */
+       int orig_order;
+       int order;
+};
+
+typedef const char *(*obj_path_fn_t)(void *obj);
+
+void order_objects(const char *orderfile, obj_path_fn_t obj_path,
+                  struct obj_order *objs, int nr);
+
 #define DIFF_DEBUG 0
 #if DIFF_DEBUG
 void diff_debug_filespec(struct diff_filespec *, int, const char *);