diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-11-02 16:53:23 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-02 16:53:23 +0900 |
| commit | 18e0648b9b9cc61f4b4bff12c97bf9ef2737b5d5 (patch) | |
| tree | 040c65e6991317e9e92bfd7ed772f03e1c3eff9f | |
| parent | 535b30eb58a19a9f006c5e88cbe9f3a13118ab94 (diff) | |
| parent | 82af2c639c4dc9a5311ec4ab97dff44a93d6798d (diff) | |
| download | git-18e0648b9b9cc61f4b4bff12c97bf9ef2737b5d5.tar.gz | |
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
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 81e1ad5832..91365e2fe2 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2325,7 +2325,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; } |