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 /builtin | |
| parent | cocci: apply the "refs.h" part of "the_repository.pending" (diff) | |
| download | git-b26a71b1beadf0184259384c12c9567ac89c0d13.tar.gz git-b26a71b1beadf0184259384c12c9567ac89c0d13.zip | |
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>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/stash.c | 2 |
1 files changed, 1 insertions, 1 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.")); |