diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2023-03-28 15:58:55 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-28 07:36:46 -0700 |
| commit | b26a71b1beadf0184259384c12c9567ac89c0d13 (patch) | |
| tree | 2648463f4e6106498711012722ac315ca9be1170 | |
| parent | 12cb1c10a64170a5d600dd1c6c8abfeec105fb6b (diff) | |
| download | git-b26a71b1beadf0184259384c12c9567ac89c0d13.tar.gz | |
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>
| -rw-r--r-- | builtin/stash.c | 2 | ||||
| -rw-r--r-- | contrib/coccinelle/the_repository.cocci | 4 | ||||
| -rw-r--r-- | contrib/coccinelle/the_repository.pending.cocci | 4 | ||||
| -rw-r--r-- | rerere.h | 3 |
4 files changed, 5 insertions, 8 deletions
diff --git a/builtin/stash.c b/builtin/stash.c 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.")); diff --git a/contrib/coccinelle/the_repository.cocci b/contrib/coccinelle/the_repository.cocci 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, diff --git a/contrib/coccinelle/the_repository.pending.cocci b/contrib/coccinelle/the_repository.pending.cocci 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 ) @@ -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 |