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>
Ævar Arnfjörð Bjarmason committed
Mar 28, 2023 at 15:58 UTC
b26a71b1beadf0184259384c12c9567ac89c0d13
4 files changed
+5
-8
builtin/stash.c
+1
-1
index 364273f101..2017c278df 100644
--- 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."));
contrib/coccinelle/the_repository.cocci
+4
index b20a3e7084..1d1ac7d4fc 100644
--- 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,
contrib/coccinelle/the_repository.pending.cocci
-4
index 8bf30798a0..1190a3312b 100644
--- 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
)
rerere.h
-3
index c32d79c3bd..876c316321 100644
--- 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