diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-11-10 05:49:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-12 05:50:06 (GMT) |
| commit | 55e6b3547d4a678e56e3aef16ad3a3c90351325a (patch) | |
| tree | 776fae712750cf145946a3401f6e9156af5a9d0a /rerere.h | |
| parent | 7c14112741b81366cfbbc3b98e0b92422fcce83d (diff) | |
| download | git-55e6b3547d4a678e56e3aef16ad3a3c90351325a.zip git-55e6b3547d4a678e56e3aef16ad3a3c90351325a.tar.gz git-55e6b3547d4a678e56e3aef16ad3a3c90351325a.tar.bz2 | |
rerere.c: remove the_repository references
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rerere.h')
| -rw-r--r-- | rerere.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -23,7 +23,7 @@ struct rerere_id { int variant; }; -int setup_rerere(struct string_list *, int); +int setup_rerere(struct repository *,struct string_list *, int); #ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS #define rerere(flags) repo_rerere(the_repository, flags) #endif @@ -37,8 +37,8 @@ int repo_rerere(struct repository *, int); const char *rerere_path(const struct rerere_id *, const char *file); int rerere_forget(struct repository *, struct pathspec *); int rerere_remaining(struct repository *, struct string_list *); -void rerere_clear(struct string_list *); -void rerere_gc(struct string_list *); +void rerere_clear(struct repository *, struct string_list *); +void rerere_gc(struct repository *, struct string_list *); #define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \ N_("update the index with reused conflict resolution if possible")) |