Skip to content

Commit 18e0648

Browse files
committed
Merge branch 'ob/sequencer-reword-error-message' into maint-2.42
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
2 parents 535b30e + 82af2c6 commit 18e0648

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
@@ -2325,7 +2325,7 @@ static int do_pick_commit(struct repository *r,
23252325
const char *dest = git_path_squash_msg(r);
23262326
unlink(dest);
23272327
if (copy_file(dest, rebase_path_squash_msg(), 0666)) {
2328-
res = error(_("could not rename '%s' to '%s'"),
2328+
res = error(_("could not copy '%s' to '%s'"),
23292329
rebase_path_squash_msg(), dest);
23302330
goto leave;
23312331
}

0 commit comments

Comments
 (0)