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>
This commit is contained in:
parent
12cb1c10a6
commit
b26a71b1be
@ -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."));
|
||||
|
@ -109,6 +109,10 @@
|
||||
|
|
||||
- dwim_ref
|
||||
+ repo_dwim_ref
|
||||
// rerere.h
|
||||
|
|
||||
- rerere
|
||||
+ repo_rerere
|
||||
)
|
||||
(
|
||||
+ the_repository,
|
||||
|
@ -5,11 +5,7 @@
|
||||
@@
|
||||
@@
|
||||
(
|
||||
// rerere.h
|
||||
- rerere
|
||||
+ repo_rerere
|
||||
// revision.h
|
||||
|
|
||||
- init_revisions
|
||||
+ repo_init_revisions
|
||||
)
|
||||
|
3
rerere.h
3
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
|
||||
|
Loading…
Reference in New Issue
Block a user