[PATCH] sequencer: fix error message on failure to copy SQUASH_MSG
- From
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
- Date
- Sep 3, 2023, 15:11 UTC
- Message-ID
- <20230903151132.739136-1-oswald.buddenhagen@gmx.de>
The message talked about renaming, while the actual action is copying. This was introduced by 6e98de72c ("sequencer (rebase -i): add support for the 'fixup' and 'squash' commands", 2017-01-02).
Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
--- i didn't try verifying whether the action shouldn't be actually be a move, as i'm getting lost in this forest of files.
Cc: Johannes Schindelin <johannes.schindelin@gmx.de> Cc: Phillip Wood <phillip.wood123@gmail.com> Cc: Junio C Hamano <gitster@pobox.com>
--- totally on a tangent, does someone feel like teaching copy_file() to try ioctl(FICLONE) (i.e., reflink) first? --- sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer.c index a66dcf8ab2..2f3d7d4eee 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2320,7 +2320,7 @@ static int do_pick_commit(struct repository *r, const char *dest = git_path_squash_msg(r); unlink(dest); if (copy_file(dest, rebase_path_squash_msg(), 0666)) { - res = error(_("could not rename '%s' to '%s'"), + res = error(_("could not copy '%s' to '%s'"), rebase_path_squash_msg(), dest); goto leave; }
-- 2.40.0.152.g15d061e6df