Skip to content

Commit 82af2c6

Browse files
ossilatorgitster
authored andcommitted
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 6e98de7 ("sequencer (rebase -i): add support for the 'fixup' and 'squash' commands", 2017-01-02). Signed-off-by: Oswald Buddenhagen <[email protected]> Acked-by: Phillip Wood <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 43c8a30 commit 82af2c6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

sequencer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2311,7 +2311,7 @@ static int do_pick_commit(struct repository *r,
23112311
const char *dest = git_path_squash_msg(r);
23122312
unlink(dest);
23132313
if (copy_file(dest, rebase_path_squash_msg(), 0666)) {
2314-
res = error(_("could not rename '%s' to '%s'"),
2314+
res = error(_("could not copy '%s' to '%s'"),
23152315
rebase_path_squash_msg(), dest);
23162316
goto leave;
23172317
}

0 commit comments

Comments
 (0)