mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2023-03-28 15:58:55 +02:00
committed by Junio C Hamano
parent 12cb1c10a6
commit b26a71b1be
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/stash.c
View File

@ -601,7 +601,7 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
ret = error(_("could not write index")); ret = error(_("could not write index"));
if (ret) { if (ret) {
rerere(0); repo_rerere(the_repository, 0);
if (index) if (index)
fprintf_ln(stderr, _("Index was not unstashed.")); fprintf_ln(stderr, _("Index was not unstashed."));

4
contrib/coccinelle/the_repository.cocci
View File

@ -109,6 +109,10 @@
| |
- dwim_ref - dwim_ref
+ repo_dwim_ref + repo_dwim_ref
// rerere.h
|
- rerere
+ repo_rerere
) )
( (
+ the_repository, + the_repository,

4
contrib/coccinelle/the_repository.pending.cocci
View File

@ -5,11 +5,7 @@
@@ @@
@@ @@
( (
// rerere.h
- rerere
+ repo_rerere
// revision.h // revision.h
|
- init_revisions - init_revisions
+ repo_init_revisions + repo_init_revisions
) )

3
rerere.h
View File

@ -24,9 +24,6 @@ struct rerere_id {
}; };
int setup_rerere(struct repository *,struct string_list *, int); 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); int repo_rerere(struct repository *, int);
/* /*
* Given the conflict ID and the name of a "file" used for replaying * Given the conflict ID and the name of a "file" used for replaying