cocci: apply the "rerere.h" part of "the_repository.pending"

Apply the part of "the_repository.pending.cocci" pertaining to
"rerere.h".

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/stash.c b/builtin/stash.c
index 364273f1012a8cb10936502228f002e49fb2dfa7..2017c278df21cbbe62e7613c20f3207c3b993883 100644 (file)
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -601,7 +601,7 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
                ret = error(_("could not write index"));
 
        if (ret) {
-               rerere(0);
+               repo_rerere(the_repository, 0);
 
                if (index)
                        fprintf_ln(stderr, _("Index was not unstashed."));

diff --git a/contrib/coccinelle/the_repository.cocci b/contrib/coccinelle/the_repository.cocci
index b20a3e7084512e1e84a855b564e805d2ef0af288..1d1ac7d4fc5499d84c7f4a9c50d2ed5a525c963f 100644 (file)
--- a/contrib/coccinelle/the_repository.cocci
+++ b/contrib/coccinelle/the_repository.cocci
@@ -109,6 +109,10 @@
 |
 - dwim_ref
 + repo_dwim_ref
+// rerere.h
+|
+- rerere
++ repo_rerere
 )
   (
 + the_repository,

diff --git a/contrib/coccinelle/the_repository.pending.cocci b/contrib/coccinelle/the_repository.pending.cocci
index 8bf30798a04ec449ecda5cf97d74a86fcbec26b3..1190a3312bd7f499ed5df66ac1c170f7e43b54ba 100644 (file)
--- a/contrib/coccinelle/the_repository.pending.cocci
+++ b/contrib/coccinelle/the_repository.pending.cocci
@@ -5,11 +5,7 @@
 @@
 @@
 (
-// rerere.h
-- rerere
-+ repo_rerere
 // revision.h
-|
 - init_revisions
 + repo_init_revisions
 )

diff --git a/rerere.h b/rerere.h
index c32d79c3bd81f1ff6e9247b77a050784b917ecfd..876c316321ebb6589f4a2a13f1b9f25053e1c960 100644 (file)
--- a/rerere.h
+++ b/rerere.h
@@ -24,9 +24,6 @@ struct rerere_id {
 };
 
 int setup_rerere(struct repository *,struct string_list *, int);
-#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
-#define rerere(flags) repo_rerere(the_repository, flags)
-#endif
 int repo_rerere(struct repository *, int);
 /*
  * Given the conflict ID and the name of a "file" used for replaying