From: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Date: Sun, 3 Sep 2023 15:11:32 +0000 (+0200)
Subject: sequencer: fix error message on failure to copy SQUASH_MSG
X-Git-Tag: v2.42.1~20^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82af2c639c4dc9a5311ec4ab97dff44a93d6798d;p=thirdparty%2Fgit.git

sequencer: fix error message on failure to copy SQUASH_MSG

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>
Acked-by: Phillip Wood <phillip.wood123@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/sequencer.c b/sequencer.c
index 5e0c15a16b..82a1f23bff 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -2311,7 +2311,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;
 			}