diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-09-13 10:07:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-09-13 10:07:57 -0700 |
| commit | d070b77d250e3b29b93dac2c39eb222ab49bce52 (patch) | |
| tree | be23513c86227a272ec20fb252efd4aef4325949 | |
| parent | Merge branch 'bc/more-git-var' (diff) | |
| parent | sequencer: fix error message on failure to copy SQUASH_MSG (diff) | |
| download | git-d070b77d250e3b29b93dac2c39eb222ab49bce52.tar.gz git-d070b77d250e3b29b93dac2c39eb222ab49bce52.zip | |
Merge branch 'ob/sequencer-reword-error-message'
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
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 9de2f30880..afebf7e37c 100644 --- a/sequencer.c +++ b/sequencer.c @@ -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; } |