| 3844 | } |
| 3845 | |
| 3846 | static int error_failed_squash(struct repository *r, |
| 3847 | struct commit *commit, |
| 3848 | struct replay_opts *opts, |
| 3849 | int subject_len, |
| 3850 | const char *subject) |
| 3851 | { |
| 3852 | if (copy_file(rebase_path_message(), rebase_path_squash_msg(), 0666)) |
| 3853 | return error(_("could not copy '%s' to '%s'"), |
| 3854 | rebase_path_squash_msg(), rebase_path_message()); |
| 3855 | unlink(git_path_merge_msg(r)); |
| 3856 | if (copy_file(git_path_merge_msg(r), rebase_path_message(), 0666)) |
| 3857 | return error(_("could not copy '%s' to '%s'"), |
| 3858 | rebase_path_message(), |
| 3859 | git_path_merge_msg(r)); |
| 3860 | return error_with_patch(r, commit, subject, subject_len, opts, 1, 0); |
| 3861 | } |
| 3862 | |
| 3863 | static int do_exec(struct repository *r, const char *command_line, int quiet) |
| 3864 | { |
no test coverage detected