@@ -341,7 +341,7 @@ int git_diff_basic_config(const char *var, const char *value, void *cb);
int git_diff_heuristic_config(const char *var, const char *value, void *cb);
void init_diff_ui_defaults(void);
int git_diff_ui_config(const char *var, const char *value, void *cb);
-#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
+#ifdef USE_THE_REPOSITORY_COMPATIBILITY_MACROS
#define diff_setup(diffopts) repo_diff_setup(the_repository, diffopts)
#endif
void repo_diff_setup(struct repository *, struct diff_options *);
@@ -24,7 +24,7 @@ struct rerere_id {
};
int setup_rerere(struct string_list *, int);
-#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
+#ifdef USE_THE_REPOSITORY_COMPATIBILITY_MACROS
#define rerere(flags) repo_rerere(the_repository, flags)
#endif
int repo_rerere(struct repository *, int);
@@ -271,7 +271,7 @@ struct setup_revision_opt {
unsigned revarg_opt;
};
-#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
+#ifdef USE_THE_REPOSITORY_COMPATIBILITY_MACROS
#define init_revisions(revs, prefix) repo_init_revisions(the_repository, revs, prefix)
#endif
void repo_init_revisions(struct repository *r,
Similar to NO_THE_INDEX_COMPATIBILITY_MACROS, this switch is now off by default. It remains here just to make it easier to merge in-flight topics where the old functions are still used. Then you can just stick #define USE_THE_REPOSITORY_COMPATIBILITY_MACROS at the beginning of those files. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- diff.h | 2 +- rerere.h | 2 +- revision.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)