rerere.h

   1 #ifndef RERERE_H
   2 #define RERERE_H
   3
   4 #include "string-list.h"
   5
   6 struct pathspec;
   7
   8 #define RERERE_AUTOUPDATE   01
   9 #define RERERE_NOAUTOUPDATE 02
  10 #define RERERE_READONLY     04
  11
  12 /*
  13  * Marks paths that have been hand-resolved and added to the
  14  * index. Set in the util field of such paths after calling
  15  * rerere_remaining.
  16  */
  17 extern void *RERERE_RESOLVED;
  18
  19 struct rerere_dir;
  20 struct rerere_id {
  21         struct rerere_dir *collection;
  22         int variant;
  23 };
  24
  25 int setup_rerere(struct string_list *, int);
  26 int rerere(int);
  27 /*
  28  * Given the conflict ID and the name of a "file" used for replaying
  29  * the recorded resolution (e.g. "preimage", "postimage"), return the
  30  * path to that filesystem entity.  With "file" specified with NULL,
  31  * return the path to the directory that houses these files.
  32  */
  33 const char *rerere_path(const struct rerere_id *, const char *file);
  34 int rerere_forget(struct pathspec *);
  35 int rerere_remaining(struct string_list *);
  36 void rerere_clear(struct string_list *);
  37 void rerere_gc(struct string_list *);
  38
  39 #define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
  40         N_("update the index with reused conflict resolution if possible"))
  41
  42 #endif