THIS IS A TEST INSTANCE ONLY! REPOSITORIES CAN BE DELETED AT ANY TIME!

Git Source Code Mirror - This is a publish-only repository and all pull requests are ignored. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
git
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

47 lines
1.4KB

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