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

avar · gitster · commit b26a71b1bead · 2023-03-28T07:36:46.000-07:00
Apply the part of "the_repository.pending.cocci" pertaining to
"rerere.h".

Signed-off-by: Ævar Arnfjörð Bjarmason &lt;avarab@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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
@@ -5,11 +5,7 @@
 @@
 @@
 (
-// rerere.h
-- rerere
-+ repo_rerere
 // revision.h
-|
 - init_revisions
 + repo_init_revisions
 )
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,10 @@`
`109`	`109`	`\|`
`110`	`110`	`- dwim_ref`
`111`	`111`	`+ repo_dwim_ref`
	`112`	`+// rerere.h`
	`113`	`+\|`
	`114`	`+- rerere`
	`115`	`++ repo_rerere`
`112`	`116`	`)`
`113`	`117`	`(`
`114`	`118`	`+ the_repository,`
Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,7 @@`
`5`	`5`	`@@`
`6`	`6`	`@@`
`7`	`7`	`(`
`8`		`-// rerere.h`
`9`		`-- rerere`
`10`		`-+ repo_rerere`
`11`	`8`	`// revision.h`
`12`		`-\|`
`13`	`9`	`- init_revisions`
`14`	`10`	`+ repo_init_revisions`
`15`	`11`	`)`