diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2023-09-03 17:11:32 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-09-05 15:27:22 -0700 |
| commit | 82af2c639c4dc9a5311ec4ab97dff44a93d6798d (patch) | |
| tree | 1c6763ab28d724844ec4d00bdb5cd375f928d071 | |
| parent | Git 2.42 (diff) | |
| download | git-82af2c639c4dc9a5311ec4ab97dff44a93d6798d.tar.gz git-82af2c639c4dc9a5311ec4ab97dff44a93d6798d.zip | |
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>
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |