mirror of
https://github.com/git-for-windows/git.git
synced 2026-04-17 05:51:57 -05:00
Merge branch 'ob/sequencer-reword-error-message' into next
Update an error message (which would probably never been seen). * ob/sequencer-reword-error-message: sequencer: fix error message on failure to copy SQUASH_MSG
This commit is contained in:
@@ -2319,7 +2319,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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user