]> git.ipfire.org Git - thirdparty/git.git/commitdiff
sequencer: fix error message on failure to copy SQUASH_MSG
authorOswald Buddenhagen <oswald.buddenhagen@gmx.de>
Sun, 3 Sep 2023 15:11:32 +0000 (17:11 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 5 Sep 2023 22:27:22 +0000 (15:27 -0700)
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>
sequencer.c

index 5e0c15a16b73b3bf04fc76afc2bc2bd1c15f677d..82a1f23bfff52e9d9417e41da7e5ee627aff645a 100644 (file)
@@ -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;
                        }