Merge branch 'sb/config-write-fix'

diff --git a/rerere.h b/rerere.h
index 407d59996d97ae307d5b4a124f78ef79666e1feb..cd948f28f494286c8e5750908eb7e35cf4293af3 100644 (file)
--- a/rerere.h
+++ b/rerere.h
@@ -16,13 +16,25 @@ struct pathspec;
  */
 extern void *RERERE_RESOLVED;
 
-extern int setup_rerere(struct string_list *, int);
-extern int rerere(int);
-extern const char *rerere_path(const char *hex, const char *file);
-extern int rerere_forget(struct pathspec *);
-extern int rerere_remaining(struct string_list *);
-extern void rerere_clear(struct string_list *);
-extern void rerere_gc(struct string_list *);
+struct rerere_dir;
+struct rerere_id {
+       struct rerere_dir *collection;
+       int variant;
+};
+
+int setup_rerere(struct string_list *, int);
+int rerere(int);
+/*
+ * Given the conflict ID and the name of a "file" used for replaying
+ * the recorded resolution (e.g. "preimage", "postimage"), return the
+ * path to that filesystem entity.  With "file" specified with NULL,
+ * return the path to the directory that houses these files.
+ */
+const char *rerere_path(const struct rerere_id *, const char *file);
+int rerere_forget(struct pathspec *);
+int rerere_remaining(struct string_list *);
+void rerere_clear(struct string_list *);
+void rerere_gc(struct string_list *);
 
 #define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
        N_("update the index with reused conflict resolution if possible"))