8 #include "run-command.h"
11 #include "cache-tree.h"
15 #include "merge-recursive.h"
17 #include "argv-array.h"
21 #include "wt-status.h"
23 #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
25 const char sign_off_header
[] = "Signed-off-by: ";
26 static const char cherry_picked_prefix
[] = "(cherry picked from commit ";
28 GIT_PATH_FUNC(git_path_seq_dir
, "sequencer")
30 static GIT_PATH_FUNC(git_path_todo_file
, "sequencer/todo")
31 static GIT_PATH_FUNC(git_path_opts_file
, "sequencer/opts")
32 static GIT_PATH_FUNC(git_path_head_file
, "sequencer/head")
33 static GIT_PATH_FUNC(git_path_abort_safety_file
, "sequencer/abort-safety")
35 static GIT_PATH_FUNC(rebase_path
, "rebase-merge")
37 * The file containing rebase commands, comments, and empty lines.
38 * This file is created by "git rebase -i" then edited by the user. As
39 * the lines are processed, they are removed from the front of this
40 * file and written to the tail of 'done'.
42 static GIT_PATH_FUNC(rebase_path_todo
, "rebase-merge/git-rebase-todo")
44 * The rebase command lines that have already been processed. A line
45 * is moved here when it is first handled, before any associated user
48 static GIT_PATH_FUNC(rebase_path_done
, "rebase-merge/done")
50 * The commit message that is planned to be used for any changes that
51 * need to be committed following a user interaction.
53 static GIT_PATH_FUNC(rebase_path_message
, "rebase-merge/message")
55 * The file into which is accumulated the suggested commit message for
56 * squash/fixup commands. When the first of a series of squash/fixups
57 * is seen, the file is created and the commit message from the
58 * previous commit and from the first squash/fixup commit are written
59 * to it. The commit message for each subsequent squash/fixup commit
60 * is appended to the file as it is processed.
62 * The first line of the file is of the form
63 * # This is a combination of $count commits.
64 * where $count is the number of commits whose messages have been
65 * written to the file so far (including the initial "pick" commit).
66 * Each time that a commit message is processed, this line is read and
67 * updated. It is deleted just before the combined commit is made.
69 static GIT_PATH_FUNC(rebase_path_squash_msg
, "rebase-merge/message-squash")
71 * If the current series of squash/fixups has not yet included a squash
72 * command, then this file exists and holds the commit message of the
73 * original "pick" commit. (If the series ends without a "squash"
74 * command, then this can be used as the commit message of the combined
75 * commit without opening the editor.)
77 static GIT_PATH_FUNC(rebase_path_fixup_msg
, "rebase-merge/message-fixup")
79 * A script to set the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and
80 * GIT_AUTHOR_DATE that will be used for the commit that is currently
83 static GIT_PATH_FUNC(rebase_path_author_script
, "rebase-merge/author-script")
85 * When an "edit" rebase command is being processed, the SHA1 of the
86 * commit to be edited is recorded in this file. When "git rebase
87 * --continue" is executed, if there are any staged changes then they
88 * will be amended to the HEAD commit, but only provided the HEAD
89 * commit is still the commit to be edited. When any other rebase
90 * command is processed, this file is deleted.
92 static GIT_PATH_FUNC(rebase_path_amend
, "rebase-merge/amend")
94 * When we stop at a given patch via the "edit" command, this file contains
95 * the abbreviated commit name of the corresponding patch.
97 static GIT_PATH_FUNC(rebase_path_stopped_sha
, "rebase-merge/stopped-sha")
99 * For the post-rewrite hook, we make a list of rewritten commits and
100 * their new sha1s. The rewritten-pending list keeps the sha1s of
101 * commits that have been processed, but not committed yet,
102 * e.g. because they are waiting for a 'squash' command.
104 static GIT_PATH_FUNC(rebase_path_rewritten_list
, "rebase-merge/rewritten-list")
105 static GIT_PATH_FUNC(rebase_path_rewritten_pending
,
106 "rebase-merge/rewritten-pending")
108 * The following files are written by git-rebase just after parsing the
109 * command-line (and are only consumed, not modified, by the sequencer).
111 static GIT_PATH_FUNC(rebase_path_gpg_sign_opt
, "rebase-merge/gpg_sign_opt")
112 static GIT_PATH_FUNC(rebase_path_orig_head
, "rebase-merge/orig-head")
113 static GIT_PATH_FUNC(rebase_path_verbose
, "rebase-merge/verbose")
114 static GIT_PATH_FUNC(rebase_path_head_name
, "rebase-merge/head-name")
115 static GIT_PATH_FUNC(rebase_path_onto
, "rebase-merge/onto")
116 static GIT_PATH_FUNC(rebase_path_autostash
, "rebase-merge/autostash")
117 static GIT_PATH_FUNC(rebase_path_strategy
, "rebase-merge/strategy")
118 static GIT_PATH_FUNC(rebase_path_strategy_opts
, "rebase-merge/strategy_opts")
120 static inline int is_rebase_i(const struct replay_opts
*opts
)
122 return opts
->action
== REPLAY_INTERACTIVE_REBASE
;
125 static const char *get_dir(const struct replay_opts
*opts
)
127 if (is_rebase_i(opts
))
128 return rebase_path();
129 return git_path_seq_dir();
132 static const char *get_todo_path(const struct replay_opts
*opts
)
134 if (is_rebase_i(opts
))
135 return rebase_path_todo();
136 return git_path_todo_file();
140 * Returns 0 for non-conforming footer
141 * Returns 1 for conforming footer
142 * Returns 2 when sob exists within conforming footer
143 * Returns 3 when sob exists within conforming footer as last entry
145 static int has_conforming_footer(struct strbuf
*sb
, struct strbuf
*sob
,
148 struct trailer_info info
;
150 int found_sob
= 0, found_sob_last
= 0;
152 trailer_info_get(&info
, sb
->buf
);
154 if (info
.trailer_start
== info
.trailer_end
)
157 for (i
= 0; i
< info
.trailer_nr
; i
++)
158 if (sob
&& !strncmp(info
.trailers
[i
], sob
->buf
, sob
->len
)) {
160 if (i
== info
.trailer_nr
- 1)
164 trailer_info_release(&info
);
173 static const char *gpg_sign_opt_quoted(struct replay_opts
*opts
)
175 static struct strbuf buf
= STRBUF_INIT
;
179 sq_quotef(&buf
, "-S%s", opts
->gpg_sign
);
183 int sequencer_remove_state(struct replay_opts
*opts
)
185 struct strbuf dir
= STRBUF_INIT
;
188 free(opts
->gpg_sign
);
189 free(opts
->strategy
);
190 for (i
= 0; i
< opts
->xopts_nr
; i
++)
191 free(opts
->xopts
[i
]);
194 strbuf_addf(&dir
, "%s", get_dir(opts
));
195 remove_dir_recursively(&dir
, 0);
196 strbuf_release(&dir
);
201 static const char *action_name(const struct replay_opts
*opts
)
203 switch (opts
->action
) {
207 return N_("cherry-pick");
208 case REPLAY_INTERACTIVE_REBASE
:
209 return N_("rebase -i");
211 die(_("Unknown action: %d"), opts
->action
);
214 struct commit_message
{
221 static const char *short_commit_name(struct commit
*commit
)
223 return find_unique_abbrev(commit
->object
.oid
.hash
, DEFAULT_ABBREV
);
226 static int get_message(struct commit
*commit
, struct commit_message
*out
)
228 const char *abbrev
, *subject
;
231 out
->message
= logmsg_reencode(commit
, NULL
, get_commit_output_encoding());
232 abbrev
= short_commit_name(commit
);
234 subject_len
= find_commit_subject(out
->message
, &subject
);
236 out
->subject
= xmemdupz(subject
, subject_len
);
237 out
->label
= xstrfmt("%s... %s", abbrev
, out
->subject
);
238 out
->parent_label
= xstrfmt("parent of %s", out
->label
);
243 static void free_message(struct commit
*commit
, struct commit_message
*msg
)
245 free(msg
->parent_label
);
248 unuse_commit_buffer(commit
, msg
->message
);
251 static void print_advice(int show_hint
, struct replay_opts
*opts
)
253 char *msg
= getenv("GIT_CHERRY_PICK_HELP");
256 fprintf(stderr
, "%s\n", msg
);
258 * A conflict has occurred but the porcelain
259 * (typically rebase --interactive) wants to take care
260 * of the commit itself so remove CHERRY_PICK_HEAD
262 unlink(git_path_cherry_pick_head());
268 advise(_("after resolving the conflicts, mark the corrected paths\n"
269 "with 'git add <paths>' or 'git rm <paths>'"));
271 advise(_("after resolving the conflicts, mark the corrected paths\n"
272 "with 'git add <paths>' or 'git rm <paths>'\n"
273 "and commit the result with 'git commit'"));
277 static int write_message(const void *buf
, size_t len
, const char *filename
,
280 static struct lock_file msg_file
;
282 int msg_fd
= hold_lock_file_for_update(&msg_file
, filename
, 0);
284 return error_errno(_("could not lock '%s'"), filename
);
285 if (write_in_full(msg_fd
, buf
, len
) < 0) {
286 rollback_lock_file(&msg_file
);
287 return error_errno(_("could not write to '%s'"), filename
);
289 if (append_eol
&& write(msg_fd
, "\n", 1) < 0) {
290 rollback_lock_file(&msg_file
);
291 return error_errno(_("could not write eol to '%s'"), filename
);
293 if (commit_lock_file(&msg_file
) < 0) {
294 rollback_lock_file(&msg_file
);
295 return error(_("failed to finalize '%s'."), filename
);
302 * Reads a file that was presumably written by a shell script, i.e. with an
303 * end-of-line marker that needs to be stripped.
305 * Note that only the last end-of-line marker is stripped, consistent with the
306 * behavior of "$(cat path)" in a shell script.
308 * Returns 1 if the file was read, 0 if it could not be read or does not exist.
310 static int read_oneliner(struct strbuf
*buf
,
311 const char *path
, int skip_if_empty
)
313 int orig_len
= buf
->len
;
315 if (!file_exists(path
))
318 if (strbuf_read_file(buf
, path
, 0) < 0) {
319 warning_errno(_("could not read '%s'"), path
);
323 if (buf
->len
> orig_len
&& buf
->buf
[buf
->len
- 1] == '\n') {
324 if (--buf
->len
> orig_len
&& buf
->buf
[buf
->len
- 1] == '\r')
326 buf
->buf
[buf
->len
] = '\0';
329 if (skip_if_empty
&& buf
->len
== orig_len
)
335 static struct tree
*empty_tree(void)
337 return lookup_tree(EMPTY_TREE_SHA1_BIN
);
340 static int error_dirty_index(struct replay_opts
*opts
)
342 if (read_cache_unmerged())
343 return error_resolve_conflict(_(action_name(opts
)));
345 error(_("your local changes would be overwritten by %s."),
346 _(action_name(opts
)));
348 if (advice_commit_before_merge
)
349 advise(_("commit your changes or stash them to proceed."));
353 static void update_abort_safety_file(void)
355 struct object_id head
;
357 /* Do nothing on a single-pick */
358 if (!file_exists(git_path_seq_dir()))
361 if (!get_oid("HEAD", &head
))
362 write_file(git_path_abort_safety_file(), "%s", oid_to_hex(&head
));
364 write_file(git_path_abort_safety_file(), "%s", "");
367 static int fast_forward_to(const unsigned char *to
, const unsigned char *from
,
368 int unborn
, struct replay_opts
*opts
)
370 struct ref_transaction
*transaction
;
371 struct strbuf sb
= STRBUF_INIT
;
372 struct strbuf err
= STRBUF_INIT
;
375 if (checkout_fast_forward(from
, to
, 1))
376 return -1; /* the callee should have complained already */
378 strbuf_addf(&sb
, _("%s: fast-forward"), _(action_name(opts
)));
380 transaction
= ref_transaction_begin(&err
);
382 ref_transaction_update(transaction
, "HEAD",
383 to
, unborn
? null_sha1
: from
,
385 ref_transaction_commit(transaction
, &err
)) {
386 ref_transaction_free(transaction
);
387 error("%s", err
.buf
);
389 strbuf_release(&err
);
394 strbuf_release(&err
);
395 ref_transaction_free(transaction
);
396 update_abort_safety_file();
400 void append_conflicts_hint(struct strbuf
*msgbuf
)
404 strbuf_addch(msgbuf
, '\n');
405 strbuf_commented_addf(msgbuf
, "Conflicts:\n");
406 for (i
= 0; i
< active_nr
;) {
407 const struct cache_entry
*ce
= active_cache
[i
++];
409 strbuf_commented_addf(msgbuf
, "\t%s\n", ce
->name
);
410 while (i
< active_nr
&& !strcmp(ce
->name
,
411 active_cache
[i
]->name
))
417 static int do_recursive_merge(struct commit
*base
, struct commit
*next
,
418 const char *base_label
, const char *next_label
,
419 unsigned char *head
, struct strbuf
*msgbuf
,
420 struct replay_opts
*opts
)
422 struct merge_options o
;
423 struct tree
*result
, *next_tree
, *base_tree
, *head_tree
;
426 static struct lock_file index_lock
;
428 hold_locked_index(&index_lock
, LOCK_DIE_ON_ERROR
);
432 init_merge_options(&o
);
433 o
.ancestor
= base
? base_label
: "(empty tree)";
435 o
.branch2
= next
? next_label
: "(empty tree)";
436 if (is_rebase_i(opts
))
439 head_tree
= parse_tree_indirect(head
);
440 next_tree
= next
? next
->tree
: empty_tree();
441 base_tree
= base
? base
->tree
: empty_tree();
443 for (xopt
= opts
->xopts
; xopt
!= opts
->xopts
+ opts
->xopts_nr
; xopt
++)
444 parse_merge_opt(&o
, *xopt
);
446 clean
= merge_trees(&o
,
448 next_tree
, base_tree
, &result
);
449 if (is_rebase_i(opts
) && clean
<= 0)
450 fputs(o
.obuf
.buf
, stdout
);
451 strbuf_release(&o
.obuf
);
455 if (active_cache_changed
&&
456 write_locked_index(&the_index
, &index_lock
, COMMIT_LOCK
))
457 /* TRANSLATORS: %s will be "revert", "cherry-pick" or
460 return error(_("%s: Unable to write new index file"),
461 _(action_name(opts
)));
462 rollback_lock_file(&index_lock
);
465 append_signoff(msgbuf
, 0, 0);
468 append_conflicts_hint(msgbuf
);
473 static int is_index_unchanged(void)
475 unsigned char head_sha1
[20];
476 struct commit
*head_commit
;
478 if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING
, head_sha1
, NULL
))
479 return error(_("could not resolve HEAD commit\n"));
481 head_commit
= lookup_commit(head_sha1
);
484 * If head_commit is NULL, check_commit, called from
485 * lookup_commit, would have indicated that head_commit is not
486 * a commit object already. parse_commit() will return failure
487 * without further complaints in such a case. Otherwise, if
488 * the commit is invalid, parse_commit() will complain. So
489 * there is nothing for us to say here. Just return failure.
491 if (parse_commit(head_commit
))
494 if (!active_cache_tree
)
495 active_cache_tree
= cache_tree();
497 if (!cache_tree_fully_valid(active_cache_tree
))
498 if (cache_tree_update(&the_index
, 0))
499 return error(_("unable to update cache tree\n"));
501 return !hashcmp(active_cache_tree
->sha1
, head_commit
->tree
->object
.oid
.hash
);
504 static int write_author_script(const char *message
)
506 struct strbuf buf
= STRBUF_INIT
;
511 if (!*message
|| starts_with(message
, "\n")) {
513 /* Missing 'author' line? */
514 unlink(rebase_path_author_script());
516 } else if (skip_prefix(message
, "author ", &message
))
518 else if ((eol
= strchr(message
, '\n')))
523 strbuf_addstr(&buf
, "GIT_AUTHOR_NAME='");
524 while (*message
&& *message
!= '\n' && *message
!= '\r')
525 if (skip_prefix(message
, " <", &message
))
527 else if (*message
!= '\'')
528 strbuf_addch(&buf
, *(message
++));
530 strbuf_addf(&buf
, "'\\\\%c'", *(message
++));
531 strbuf_addstr(&buf
, "'\nGIT_AUTHOR_EMAIL='");
532 while (*message
&& *message
!= '\n' && *message
!= '\r')
533 if (skip_prefix(message
, "> ", &message
))
535 else if (*message
!= '\'')
536 strbuf_addch(&buf
, *(message
++));
538 strbuf_addf(&buf
, "'\\\\%c'", *(message
++));
539 strbuf_addstr(&buf
, "'\nGIT_AUTHOR_DATE='@");
540 while (*message
&& *message
!= '\n' && *message
!= '\r')
541 if (*message
!= '\'')
542 strbuf_addch(&buf
, *(message
++));
544 strbuf_addf(&buf
, "'\\\\%c'", *(message
++));
545 res
= write_message(buf
.buf
, buf
.len
, rebase_path_author_script(), 1);
546 strbuf_release(&buf
);
551 * Read a list of environment variable assignments (such as the author-script
552 * file) into an environment block. Returns -1 on error, 0 otherwise.
554 static int read_env_script(struct argv_array
*env
)
556 struct strbuf script
= STRBUF_INIT
;
560 if (strbuf_read_file(&script
, rebase_path_author_script(), 256) <= 0)
563 for (p
= script
.buf
; *p
; p
++)
564 if (skip_prefix(p
, "'\\\\''", (const char **)&p2
))
565 strbuf_splice(&script
, p
- script
.buf
, p2
- p
, "'", 1);
567 strbuf_splice(&script
, p
-- - script
.buf
, 1, "", 0);
568 else if (*p
== '\n') {
573 for (i
= 0, p
= script
.buf
; i
< count
; i
++) {
574 argv_array_push(env
, p
);
581 static const char staged_changes_advice
[] =
582 N_("you have staged changes in your working tree\n"
583 "If these changes are meant to be squashed into the previous commit, run:\n"
585 " git commit --amend %s\n"
587 "If they are meant to go into a new commit, run:\n"
591 "In both cases, once you're done, continue with:\n"
593 " git rebase --continue\n");
596 * If we are cherry-pick, and if the merge did not result in
597 * hand-editing, we will hit this commit and inherit the original
598 * author date and name.
600 * If we are revert, or if our cherry-pick results in a hand merge,
601 * we had better say that the current user is responsible for that.
603 * An exception is when run_git_commit() is called during an
604 * interactive rebase: in that case, we will want to retain the
607 static int run_git_commit(const char *defmsg
, struct replay_opts
*opts
,
608 int allow_empty
, int edit
, int amend
,
609 int cleanup_commit_message
)
611 struct child_process cmd
= CHILD_PROCESS_INIT
;
616 if (is_rebase_i(opts
)) {
618 cmd
.stdout_to_stderr
= 1;
622 if (read_env_script(&cmd
.env_array
)) {
623 const char *gpg_opt
= gpg_sign_opt_quoted(opts
);
625 return error(_(staged_changes_advice
),
630 argv_array_push(&cmd
.args
, "commit");
631 argv_array_push(&cmd
.args
, "-n");
634 argv_array_push(&cmd
.args
, "--amend");
636 argv_array_pushf(&cmd
.args
, "-S%s", opts
->gpg_sign
);
638 argv_array_push(&cmd
.args
, "-s");
640 argv_array_pushl(&cmd
.args
, "-F", defmsg
, NULL
);
641 if (cleanup_commit_message
)
642 argv_array_push(&cmd
.args
, "--cleanup=strip");
644 argv_array_push(&cmd
.args
, "-e");
645 else if (!cleanup_commit_message
&&
646 !opts
->signoff
&& !opts
->record_origin
&&
647 git_config_get_value("commit.cleanup", &value
))
648 argv_array_push(&cmd
.args
, "--cleanup=verbatim");
651 argv_array_push(&cmd
.args
, "--allow-empty");
653 if (opts
->allow_empty_message
)
654 argv_array_push(&cmd
.args
, "--allow-empty-message");
657 /* hide stderr on success */
658 struct strbuf buf
= STRBUF_INIT
;
659 int rc
= pipe_command(&cmd
,
661 /* stdout is already redirected */
665 fputs(buf
.buf
, stderr
);
666 strbuf_release(&buf
);
670 return run_command(&cmd
);
673 static int is_original_commit_empty(struct commit
*commit
)
675 const unsigned char *ptree_sha1
;
677 if (parse_commit(commit
))
678 return error(_("could not parse commit %s\n"),
679 oid_to_hex(&commit
->object
.oid
));
680 if (commit
->parents
) {
681 struct commit
*parent
= commit
->parents
->item
;
682 if (parse_commit(parent
))
683 return error(_("could not parse parent commit %s\n"),
684 oid_to_hex(&parent
->object
.oid
));
685 ptree_sha1
= parent
->tree
->object
.oid
.hash
;
687 ptree_sha1
= EMPTY_TREE_SHA1_BIN
; /* commit is root */
690 return !hashcmp(ptree_sha1
, commit
->tree
->object
.oid
.hash
);
694 * Do we run "git commit" with "--allow-empty"?
696 static int allow_empty(struct replay_opts
*opts
, struct commit
*commit
)
698 int index_unchanged
, empty_commit
;
703 * (1) we do not allow empty at all and error out.
705 * (2) we allow ones that were initially empty, but
706 * forbid the ones that become empty;
710 if (!opts
->allow_empty
)
711 return 0; /* let "git commit" barf as necessary */
713 index_unchanged
= is_index_unchanged();
714 if (index_unchanged
< 0)
715 return index_unchanged
;
716 if (!index_unchanged
)
717 return 0; /* we do not have to say --allow-empty */
719 if (opts
->keep_redundant_commits
)
722 empty_commit
= is_original_commit_empty(commit
);
723 if (empty_commit
< 0)
732 * Note that ordering matters in this enum. Not only must it match the mapping
733 * below, it is also divided into several sections that matter. When adding
734 * new commands, make sure you add it in the right section.
737 /* commands that handle commits */
744 /* commands that do something else than handling a single commit */
746 /* commands that do nothing but are counted for reporting progress */
749 /* comments (not counted for reporting progress) */
756 } todo_command_info
[] = {
769 static const char *command_to_string(const enum todo_command command
)
771 if (command
< TODO_COMMENT
)
772 return todo_command_info
[command
].str
;
773 die("Unknown command: %d", command
);
776 static int is_noop(const enum todo_command command
)
778 return TODO_NOOP
<= command
;
781 static int is_fixup(enum todo_command command
)
783 return command
== TODO_FIXUP
|| command
== TODO_SQUASH
;
786 static int update_squash_messages(enum todo_command command
,
787 struct commit
*commit
, struct replay_opts
*opts
)
789 struct strbuf buf
= STRBUF_INIT
;
791 const char *message
, *body
;
793 if (file_exists(rebase_path_squash_msg())) {
794 struct strbuf header
= STRBUF_INIT
;
797 if (strbuf_read_file(&buf
, rebase_path_squash_msg(), 2048) <= 0)
798 return error(_("could not read '%s'"),
799 rebase_path_squash_msg());
802 eol
= strchrnul(buf
.buf
, '\n');
803 if (buf
.buf
[0] != comment_line_char
||
804 (p
+= strcspn(p
, "0123456789\n")) == eol
)
805 return error(_("unexpected 1st line of squash message:"
807 (int)(eol
- buf
.buf
), buf
.buf
);
808 count
= strtol(p
, NULL
, 10);
811 return error(_("invalid 1st line of squash message:\n"
813 (int)(eol
- buf
.buf
), buf
.buf
);
815 strbuf_addf(&header
, "%c ", comment_line_char
);
817 _("This is a combination of %d commits."), ++count
);
818 strbuf_splice(&buf
, 0, eol
- buf
.buf
, header
.buf
, header
.len
);
819 strbuf_release(&header
);
821 unsigned char head
[20];
822 struct commit
*head_commit
;
823 const char *head_message
, *body
;
825 if (get_sha1("HEAD", head
))
826 return error(_("need a HEAD to fixup"));
827 if (!(head_commit
= lookup_commit_reference(head
)))
828 return error(_("could not read HEAD"));
829 if (!(head_message
= get_commit_buffer(head_commit
, NULL
)))
830 return error(_("could not read HEAD's commit message"));
832 find_commit_subject(head_message
, &body
);
833 if (write_message(body
, strlen(body
),
834 rebase_path_fixup_msg(), 0)) {
835 unuse_commit_buffer(head_commit
, head_message
);
836 return error(_("cannot write '%s'"),
837 rebase_path_fixup_msg());
841 strbuf_addf(&buf
, "%c ", comment_line_char
);
842 strbuf_addf(&buf
, _("This is a combination of %d commits."),
844 strbuf_addf(&buf
, "\n%c ", comment_line_char
);
845 strbuf_addstr(&buf
, _("This is the 1st commit message:"));
846 strbuf_addstr(&buf
, "\n\n");
847 strbuf_addstr(&buf
, body
);
849 unuse_commit_buffer(head_commit
, head_message
);
852 if (!(message
= get_commit_buffer(commit
, NULL
)))
853 return error(_("could not read commit message of %s"),
854 oid_to_hex(&commit
->object
.oid
));
855 find_commit_subject(message
, &body
);
857 if (command
== TODO_SQUASH
) {
858 unlink(rebase_path_fixup_msg());
859 strbuf_addf(&buf
, "\n%c ", comment_line_char
);
860 strbuf_addf(&buf
, _("This is the commit message #%d:"), count
);
861 strbuf_addstr(&buf
, "\n\n");
862 strbuf_addstr(&buf
, body
);
863 } else if (command
== TODO_FIXUP
) {
864 strbuf_addf(&buf
, "\n%c ", comment_line_char
);
865 strbuf_addf(&buf
, _("The commit message #%d will be skipped:"),
867 strbuf_addstr(&buf
, "\n\n");
868 strbuf_add_commented_lines(&buf
, body
, strlen(body
));
870 return error(_("unknown command: %d"), command
);
871 unuse_commit_buffer(commit
, message
);
873 res
= write_message(buf
.buf
, buf
.len
, rebase_path_squash_msg(), 0);
874 strbuf_release(&buf
);
878 static void flush_rewritten_pending(void) {
879 struct strbuf buf
= STRBUF_INIT
;
880 unsigned char newsha1
[20];
883 if (strbuf_read_file(&buf
, rebase_path_rewritten_pending(), 82) > 0 &&
884 !get_sha1("HEAD", newsha1
) &&
885 (out
= fopen(rebase_path_rewritten_list(), "a"))) {
886 char *bol
= buf
.buf
, *eol
;
889 eol
= strchrnul(bol
, '\n');
890 fprintf(out
, "%.*s %s\n", (int)(eol
- bol
),
891 bol
, sha1_to_hex(newsha1
));
897 unlink(rebase_path_rewritten_pending());
899 strbuf_release(&buf
);
902 static void record_in_rewritten(struct object_id
*oid
,
903 enum todo_command next_command
) {
904 FILE *out
= fopen(rebase_path_rewritten_pending(), "a");
909 fprintf(out
, "%s\n", oid_to_hex(oid
));
912 if (!is_fixup(next_command
))
913 flush_rewritten_pending();
916 static int do_pick_commit(enum todo_command command
, struct commit
*commit
,
917 struct replay_opts
*opts
, int final_fixup
)
919 int edit
= opts
->edit
, cleanup_commit_message
= 0;
920 const char *msg_file
= edit
? NULL
: git_path_merge_msg();
921 unsigned char head
[20];
922 struct commit
*base
, *next
, *parent
;
923 const char *base_label
, *next_label
;
924 struct commit_message msg
= { NULL
, NULL
, NULL
, NULL
};
925 struct strbuf msgbuf
= STRBUF_INIT
;
926 int res
, unborn
= 0, amend
= 0, allow
= 0;
928 if (opts
->no_commit
) {
930 * We do not intend to commit immediately. We just want to
931 * merge the differences in, so let's compute the tree
932 * that represents the "current" state for merge-recursive
935 if (write_cache_as_tree(head
, 0, NULL
))
936 return error(_("your index file is unmerged."));
938 unborn
= get_sha1("HEAD", head
);
940 hashcpy(head
, EMPTY_TREE_SHA1_BIN
);
941 if (index_differs_from(unborn
? EMPTY_TREE_SHA1_HEX
: "HEAD", 0, 0))
942 return error_dirty_index(opts
);
946 if (!commit
->parents
)
948 else if (commit
->parents
->next
) {
949 /* Reverting or cherry-picking a merge commit */
951 struct commit_list
*p
;
954 return error(_("commit %s is a merge but no -m option was given."),
955 oid_to_hex(&commit
->object
.oid
));
957 for (cnt
= 1, p
= commit
->parents
;
958 cnt
!= opts
->mainline
&& p
;
961 if (cnt
!= opts
->mainline
|| !p
)
962 return error(_("commit %s does not have parent %d"),
963 oid_to_hex(&commit
->object
.oid
), opts
->mainline
);
965 } else if (0 < opts
->mainline
)
966 return error(_("mainline was specified but commit %s is not a merge."),
967 oid_to_hex(&commit
->object
.oid
));
969 parent
= commit
->parents
->item
;
971 if (get_message(commit
, &msg
) != 0)
972 return error(_("cannot get commit message for %s"),
973 oid_to_hex(&commit
->object
.oid
));
975 if (opts
->allow_ff
&& !is_fixup(command
) &&
976 ((parent
&& !hashcmp(parent
->object
.oid
.hash
, head
)) ||
977 (!parent
&& unborn
))) {
978 if (is_rebase_i(opts
))
979 write_author_script(msg
.message
);
980 res
= fast_forward_to(commit
->object
.oid
.hash
, head
, unborn
,
982 if (res
|| command
!= TODO_REWORD
)
986 goto fast_forward_edit
;
988 if (parent
&& parse_commit(parent
) < 0)
989 /* TRANSLATORS: The first %s will be a "todo" command like
990 "revert" or "pick", the second %s a SHA1. */
991 return error(_("%s: cannot parse parent commit %s"),
992 command_to_string(command
),
993 oid_to_hex(&parent
->object
.oid
));
996 * "commit" is an existing commit. We would want to apply
997 * the difference it introduces since its first parent "prev"
998 * on top of the current HEAD if we are cherry-pick. Or the
999 * reverse of it if we are revert.
1002 if (command
== TODO_REVERT
) {
1004 base_label
= msg
.label
;
1006 next_label
= msg
.parent_label
;
1007 strbuf_addstr(&msgbuf
, "Revert \"");
1008 strbuf_addstr(&msgbuf
, msg
.subject
);
1009 strbuf_addstr(&msgbuf
, "\"\n\nThis reverts commit ");
1010 strbuf_addstr(&msgbuf
, oid_to_hex(&commit
->object
.oid
));
1012 if (commit
->parents
&& commit
->parents
->next
) {
1013 strbuf_addstr(&msgbuf
, ", reversing\nchanges made to ");
1014 strbuf_addstr(&msgbuf
, oid_to_hex(&parent
->object
.oid
));
1016 strbuf_addstr(&msgbuf
, ".\n");
1021 base_label
= msg
.parent_label
;
1023 next_label
= msg
.label
;
1025 /* Append the commit log message to msgbuf. */
1026 if (find_commit_subject(msg
.message
, &p
))
1027 strbuf_addstr(&msgbuf
, p
);
1029 if (opts
->record_origin
) {
1030 if (!has_conforming_footer(&msgbuf
, NULL
, 0))
1031 strbuf_addch(&msgbuf
, '\n');
1032 strbuf_addstr(&msgbuf
, cherry_picked_prefix
);
1033 strbuf_addstr(&msgbuf
, oid_to_hex(&commit
->object
.oid
));
1034 strbuf_addstr(&msgbuf
, ")\n");
1038 if (command
== TODO_REWORD
)
1040 else if (is_fixup(command
)) {
1041 if (update_squash_messages(command
, commit
, opts
))
1045 msg_file
= rebase_path_squash_msg();
1046 else if (file_exists(rebase_path_fixup_msg())) {
1047 cleanup_commit_message
= 1;
1048 msg_file
= rebase_path_fixup_msg();
1050 const char *dest
= git_path("SQUASH_MSG");
1052 if (copy_file(dest
, rebase_path_squash_msg(), 0666))
1053 return error(_("could not rename '%s' to '%s'"),
1054 rebase_path_squash_msg(), dest
);
1055 unlink(git_path("MERGE_MSG"));
1061 if (is_rebase_i(opts
) && write_author_script(msg
.message
) < 0)
1063 else if (!opts
->strategy
|| !strcmp(opts
->strategy
, "recursive") || command
== TODO_REVERT
) {
1064 res
= do_recursive_merge(base
, next
, base_label
, next_label
,
1065 head
, &msgbuf
, opts
);
1068 res
|= write_message(msgbuf
.buf
, msgbuf
.len
,
1069 git_path_merge_msg(), 0);
1071 struct commit_list
*common
= NULL
;
1072 struct commit_list
*remotes
= NULL
;
1074 res
= write_message(msgbuf
.buf
, msgbuf
.len
,
1075 git_path_merge_msg(), 0);
1077 commit_list_insert(base
, &common
);
1078 commit_list_insert(next
, &remotes
);
1079 res
|= try_merge_command(opts
->strategy
,
1080 opts
->xopts_nr
, (const char **)opts
->xopts
,
1081 common
, sha1_to_hex(head
), remotes
);
1082 free_commit_list(common
);
1083 free_commit_list(remotes
);
1085 strbuf_release(&msgbuf
);
1088 * If the merge was clean or if it failed due to conflict, we write
1089 * CHERRY_PICK_HEAD for the subsequent invocation of commit to use.
1090 * However, if the merge did not even start, then we don't want to
1093 if (command
== TODO_PICK
&& !opts
->no_commit
&& (res
== 0 || res
== 1) &&
1094 update_ref(NULL
, "CHERRY_PICK_HEAD", commit
->object
.oid
.hash
, NULL
,
1095 REF_NODEREF
, UPDATE_REFS_MSG_ON_ERR
))
1097 if (command
== TODO_REVERT
&& ((opts
->no_commit
&& res
== 0) || res
== 1) &&
1098 update_ref(NULL
, "REVERT_HEAD", commit
->object
.oid
.hash
, NULL
,
1099 REF_NODEREF
, UPDATE_REFS_MSG_ON_ERR
))
1103 error(command
== TODO_REVERT
1104 ? _("could not revert %s... %s")
1105 : _("could not apply %s... %s"),
1106 short_commit_name(commit
), msg
.subject
);
1107 print_advice(res
== 1, opts
);
1108 rerere(opts
->allow_rerere_auto
);
1112 allow
= allow_empty(opts
, commit
);
1117 if (!opts
->no_commit
)
1119 res
= run_git_commit(msg_file
, opts
, allow
, edit
, amend
,
1120 cleanup_commit_message
);
1122 if (!res
&& final_fixup
) {
1123 unlink(rebase_path_fixup_msg());
1124 unlink(rebase_path_squash_msg());
1128 free_message(commit
, &msg
);
1129 update_abort_safety_file();
1134 static int prepare_revs(struct replay_opts
*opts
)
1137 * picking (but not reverting) ranges (but not individual revisions)
1138 * should be done in reverse
1140 if (opts
->action
== REPLAY_PICK
&& !opts
->revs
->no_walk
)
1141 opts
->revs
->reverse
^= 1;
1143 if (prepare_revision_walk(opts
->revs
))
1144 return error(_("revision walk setup failed"));
1146 if (!opts
->revs
->commits
)
1147 return error(_("empty commit set passed"));
1151 static int read_and_refresh_cache(struct replay_opts
*opts
)
1153 static struct lock_file index_lock
;
1154 int index_fd
= hold_locked_index(&index_lock
, 0);
1155 if (read_index_preload(&the_index
, NULL
) < 0) {
1156 rollback_lock_file(&index_lock
);
1157 return error(_("git %s: failed to read the index"),
1158 _(action_name(opts
)));
1160 refresh_index(&the_index
, REFRESH_QUIET
|REFRESH_UNMERGED
, NULL
, NULL
, NULL
);
1161 if (the_index
.cache_changed
&& index_fd
>= 0) {
1162 if (write_locked_index(&the_index
, &index_lock
, COMMIT_LOCK
)) {
1163 rollback_lock_file(&index_lock
);
1164 return error(_("git %s: failed to refresh the index"),
1165 _(action_name(opts
)));
1168 rollback_lock_file(&index_lock
);
1173 enum todo_command command
;
1174 struct commit
*commit
;
1177 size_t offset_in_buf
;
1182 struct todo_item
*items
;
1183 int nr
, alloc
, current
;
1186 #define TODO_LIST_INIT { STRBUF_INIT }
1188 static void todo_list_release(struct todo_list
*todo_list
)
1190 strbuf_release(&todo_list
->buf
);
1191 free(todo_list
->items
);
1192 todo_list
->items
= NULL
;
1193 todo_list
->nr
= todo_list
->alloc
= 0;
1196 static struct todo_item
*append_new_todo(struct todo_list
*todo_list
)
1198 ALLOC_GROW(todo_list
->items
, todo_list
->nr
+ 1, todo_list
->alloc
);
1199 return todo_list
->items
+ todo_list
->nr
++;
1202 static int parse_insn_line(struct todo_item
*item
, const char *bol
, char *eol
)
1204 unsigned char commit_sha1
[20];
1205 char *end_of_object_name
;
1206 int i
, saved
, status
, padding
;
1209 bol
+= strspn(bol
, " \t");
1211 if (bol
== eol
|| *bol
== '\r' || *bol
== comment_line_char
) {
1212 item
->command
= TODO_COMMENT
;
1213 item
->commit
= NULL
;
1215 item
->arg_len
= eol
- bol
;
1219 for (i
= 0; i
< TODO_COMMENT
; i
++)
1220 if (skip_prefix(bol
, todo_command_info
[i
].str
, &bol
)) {
1223 } else if (bol
[1] == ' ' && *bol
== todo_command_info
[i
].c
) {
1228 if (i
>= TODO_COMMENT
)
1231 if (item
->command
== TODO_NOOP
) {
1232 item
->commit
= NULL
;
1234 item
->arg_len
= eol
- bol
;
1238 /* Eat up extra spaces/ tabs before object name */
1239 padding
= strspn(bol
, " \t");
1244 if (item
->command
== TODO_EXEC
) {
1246 item
->arg_len
= (int)(eol
- bol
);
1250 end_of_object_name
= (char *) bol
+ strcspn(bol
, " \t\n");
1251 saved
= *end_of_object_name
;
1252 *end_of_object_name
= '\0';
1253 status
= get_sha1(bol
, commit_sha1
);
1254 *end_of_object_name
= saved
;
1256 item
->arg
= end_of_object_name
+ strspn(end_of_object_name
, " \t");
1257 item
->arg_len
= (int)(eol
- item
->arg
);
1262 item
->commit
= lookup_commit_reference(commit_sha1
);
1263 return !item
->commit
;
1266 static int parse_insn_buffer(char *buf
, struct todo_list
*todo_list
)
1268 struct todo_item
*item
;
1269 char *p
= buf
, *next_p
;
1270 int i
, res
= 0, fixup_okay
= file_exists(rebase_path_done());
1272 for (i
= 1; *p
; i
++, p
= next_p
) {
1273 char *eol
= strchrnul(p
, '\n');
1275 next_p
= *eol
? eol
+ 1 /* skip LF */ : eol
;
1277 if (p
!= eol
&& eol
[-1] == '\r')
1278 eol
--; /* strip Carriage Return */
1280 item
= append_new_todo(todo_list
);
1281 item
->offset_in_buf
= p
- todo_list
->buf
.buf
;
1282 if (parse_insn_line(item
, p
, eol
)) {
1283 res
= error(_("invalid line %d: %.*s"),
1284 i
, (int)(eol
- p
), p
);
1285 item
->command
= TODO_NOOP
;
1290 else if (is_fixup(item
->command
))
1291 return error(_("cannot '%s' without a previous commit"),
1292 command_to_string(item
->command
));
1293 else if (!is_noop(item
->command
))
1300 static int read_populate_todo(struct todo_list
*todo_list
,
1301 struct replay_opts
*opts
)
1303 const char *todo_file
= get_todo_path(opts
);
1306 strbuf_reset(&todo_list
->buf
);
1307 fd
= open(todo_file
, O_RDONLY
);
1309 return error_errno(_("could not open '%s'"), todo_file
);
1310 if (strbuf_read(&todo_list
->buf
, fd
, 0) < 0) {
1312 return error(_("could not read '%s'."), todo_file
);
1316 res
= parse_insn_buffer(todo_list
->buf
.buf
, todo_list
);
1318 return error(_("unusable instruction sheet: '%s'"), todo_file
);
1320 if (!todo_list
->nr
&&
1321 (!is_rebase_i(opts
) || !file_exists(rebase_path_done())))
1322 return error(_("no commits parsed."));
1324 if (!is_rebase_i(opts
)) {
1325 enum todo_command valid
=
1326 opts
->action
== REPLAY_PICK
? TODO_PICK
: TODO_REVERT
;
1329 for (i
= 0; i
< todo_list
->nr
; i
++)
1330 if (valid
== todo_list
->items
[i
].command
)
1332 else if (valid
== TODO_PICK
)
1333 return error(_("cannot cherry-pick during a revert."));
1335 return error(_("cannot revert during a cherry-pick."));
1341 static int git_config_string_dup(char **dest
,
1342 const char *var
, const char *value
)
1345 return config_error_nonbool(var
);
1347 *dest
= xstrdup(value
);
1351 static int populate_opts_cb(const char *key
, const char *value
, void *data
)
1353 struct replay_opts
*opts
= data
;
1358 else if (!strcmp(key
, "options.no-commit"))
1359 opts
->no_commit
= git_config_bool_or_int(key
, value
, &error_flag
);
1360 else if (!strcmp(key
, "options.edit"))
1361 opts
->edit
= git_config_bool_or_int(key
, value
, &error_flag
);
1362 else if (!strcmp(key
, "options.signoff"))
1363 opts
->signoff
= git_config_bool_or_int(key
, value
, &error_flag
);
1364 else if (!strcmp(key
, "options.record-origin"))
1365 opts
->record_origin
= git_config_bool_or_int(key
, value
, &error_flag
);
1366 else if (!strcmp(key
, "options.allow-ff"))
1367 opts
->allow_ff
= git_config_bool_or_int(key
, value
, &error_flag
);
1368 else if (!strcmp(key
, "options.mainline"))
1369 opts
->mainline
= git_config_int(key
, value
);
1370 else if (!strcmp(key
, "options.strategy"))
1371 git_config_string_dup(&opts
->strategy
, key
, value
);
1372 else if (!strcmp(key
, "options.gpg-sign"))
1373 git_config_string_dup(&opts
->gpg_sign
, key
, value
);
1374 else if (!strcmp(key
, "options.strategy-option")) {
1375 ALLOC_GROW(opts
->xopts
, opts
->xopts_nr
+ 1, opts
->xopts_alloc
);
1376 opts
->xopts
[opts
->xopts_nr
++] = xstrdup(value
);
1378 return error(_("invalid key: %s"), key
);
1381 return error(_("invalid value for %s: %s"), key
, value
);
1386 static void read_strategy_opts(struct replay_opts
*opts
, struct strbuf
*buf
)
1391 if (!read_oneliner(buf
, rebase_path_strategy(), 0))
1393 opts
->strategy
= strbuf_detach(buf
, NULL
);
1394 if (!read_oneliner(buf
, rebase_path_strategy_opts(), 0))
1397 opts
->xopts_nr
= split_cmdline(buf
->buf
, (const char ***)&opts
->xopts
);
1398 for (i
= 0; i
< opts
->xopts_nr
; i
++) {
1399 const char *arg
= opts
->xopts
[i
];
1401 skip_prefix(arg
, "--", &arg
);
1402 opts
->xopts
[i
] = xstrdup(arg
);
1406 static int read_populate_opts(struct replay_opts
*opts
)
1408 if (is_rebase_i(opts
)) {
1409 struct strbuf buf
= STRBUF_INIT
;
1411 if (read_oneliner(&buf
, rebase_path_gpg_sign_opt(), 1)) {
1412 if (!starts_with(buf
.buf
, "-S"))
1415 free(opts
->gpg_sign
);
1416 opts
->gpg_sign
= xstrdup(buf
.buf
+ 2);
1420 if (file_exists(rebase_path_verbose()))
1423 read_strategy_opts(opts
, &buf
);
1424 strbuf_release(&buf
);
1429 if (!file_exists(git_path_opts_file()))
1432 * The function git_parse_source(), called from git_config_from_file(),
1433 * may die() in case of a syntactically incorrect file. We do not care
1434 * about this case, though, because we wrote that file ourselves, so we
1435 * are pretty certain that it is syntactically correct.
1437 if (git_config_from_file(populate_opts_cb
, git_path_opts_file(), opts
) < 0)
1438 return error(_("malformed options sheet: '%s'"),
1439 git_path_opts_file());
1443 static int walk_revs_populate_todo(struct todo_list
*todo_list
,
1444 struct replay_opts
*opts
)
1446 enum todo_command command
= opts
->action
== REPLAY_PICK
?
1447 TODO_PICK
: TODO_REVERT
;
1448 const char *command_string
= todo_command_info
[command
].str
;
1449 struct commit
*commit
;
1451 if (prepare_revs(opts
))
1454 while ((commit
= get_revision(opts
->revs
))) {
1455 struct todo_item
*item
= append_new_todo(todo_list
);
1456 const char *commit_buffer
= get_commit_buffer(commit
, NULL
);
1457 const char *subject
;
1460 item
->command
= command
;
1461 item
->commit
= commit
;
1464 item
->offset_in_buf
= todo_list
->buf
.len
;
1465 subject_len
= find_commit_subject(commit_buffer
, &subject
);
1466 strbuf_addf(&todo_list
->buf
, "%s %s %.*s\n", command_string
,
1467 short_commit_name(commit
), subject_len
, subject
);
1468 unuse_commit_buffer(commit
, commit_buffer
);
1473 static int create_seq_dir(void)
1475 if (file_exists(git_path_seq_dir())) {
1476 error(_("a cherry-pick or revert is already in progress"));
1477 advise(_("try \"git cherry-pick (--continue | --quit | --abort)\""));
1479 } else if (mkdir(git_path_seq_dir(), 0777) < 0)
1480 return error_errno(_("could not create sequencer directory '%s'"),
1481 git_path_seq_dir());
1485 static int save_head(const char *head
)
1487 static struct lock_file head_lock
;
1488 struct strbuf buf
= STRBUF_INIT
;
1491 fd
= hold_lock_file_for_update(&head_lock
, git_path_head_file(), 0);
1493 rollback_lock_file(&head_lock
);
1494 return error_errno(_("could not lock HEAD"));
1496 strbuf_addf(&buf
, "%s\n", head
);
1497 if (write_in_full(fd
, buf
.buf
, buf
.len
) < 0) {
1498 rollback_lock_file(&head_lock
);
1499 return error_errno(_("could not write to '%s'"),
1500 git_path_head_file());
1502 if (commit_lock_file(&head_lock
) < 0) {
1503 rollback_lock_file(&head_lock
);
1504 return error(_("failed to finalize '%s'."), git_path_head_file());
1509 static int rollback_is_safe(void)
1511 struct strbuf sb
= STRBUF_INIT
;
1512 struct object_id expected_head
, actual_head
;
1514 if (strbuf_read_file(&sb
, git_path_abort_safety_file(), 0) >= 0) {
1516 if (get_oid_hex(sb
.buf
, &expected_head
)) {
1517 strbuf_release(&sb
);
1518 die(_("could not parse %s"), git_path_abort_safety_file());
1520 strbuf_release(&sb
);
1522 else if (errno
== ENOENT
)
1523 oidclr(&expected_head
);
1525 die_errno(_("could not read '%s'"), git_path_abort_safety_file());
1527 if (get_oid("HEAD", &actual_head
))
1528 oidclr(&actual_head
);
1530 return !oidcmp(&actual_head
, &expected_head
);
1533 static int reset_for_rollback(const unsigned char *sha1
)
1535 const char *argv
[4]; /* reset --merge <arg> + NULL */
1538 argv
[1] = "--merge";
1539 argv
[2] = sha1_to_hex(sha1
);
1541 return run_command_v_opt(argv
, RUN_GIT_CMD
);
1544 static int rollback_single_pick(void)
1546 unsigned char head_sha1
[20];
1548 if (!file_exists(git_path_cherry_pick_head()) &&
1549 !file_exists(git_path_revert_head()))
1550 return error(_("no cherry-pick or revert in progress"));
1551 if (read_ref_full("HEAD", 0, head_sha1
, NULL
))
1552 return error(_("cannot resolve HEAD"));
1553 if (is_null_sha1(head_sha1
))
1554 return error(_("cannot abort from a branch yet to be born"));
1555 return reset_for_rollback(head_sha1
);
1558 int sequencer_rollback(struct replay_opts
*opts
)
1561 unsigned char sha1
[20];
1562 struct strbuf buf
= STRBUF_INIT
;
1564 f
= fopen(git_path_head_file(), "r");
1565 if (!f
&& errno
== ENOENT
) {
1567 * There is no multiple-cherry-pick in progress.
1568 * If CHERRY_PICK_HEAD or REVERT_HEAD indicates
1569 * a single-cherry-pick in progress, abort that.
1571 return rollback_single_pick();
1574 return error_errno(_("cannot open '%s'"), git_path_head_file());
1575 if (strbuf_getline_lf(&buf
, f
)) {
1576 error(_("cannot read '%s': %s"), git_path_head_file(),
1577 ferror(f
) ? strerror(errno
) : _("unexpected end of file"));
1582 if (get_sha1_hex(buf
.buf
, sha1
) || buf
.buf
[40] != '\0') {
1583 error(_("stored pre-cherry-pick HEAD file '%s' is corrupt"),
1584 git_path_head_file());
1587 if (is_null_sha1(sha1
)) {
1588 error(_("cannot abort from a branch yet to be born"));
1592 if (!rollback_is_safe()) {
1593 /* Do not error, just do not rollback */
1594 warning(_("You seem to have moved HEAD. "
1595 "Not rewinding, check your HEAD!"));
1597 if (reset_for_rollback(sha1
))
1599 strbuf_release(&buf
);
1600 return sequencer_remove_state(opts
);
1602 strbuf_release(&buf
);
1606 static int save_todo(struct todo_list
*todo_list
, struct replay_opts
*opts
)
1608 static struct lock_file todo_lock
;
1609 const char *todo_path
= get_todo_path(opts
);
1610 int next
= todo_list
->current
, offset
, fd
;
1613 * rebase -i writes "git-rebase-todo" without the currently executing
1614 * command, appending it to "done" instead.
1616 if (is_rebase_i(opts
))
1619 fd
= hold_lock_file_for_update(&todo_lock
, todo_path
, 0);
1621 return error_errno(_("could not lock '%s'"), todo_path
);
1622 offset
= next
< todo_list
->nr
?
1623 todo_list
->items
[next
].offset_in_buf
: todo_list
->buf
.len
;
1624 if (write_in_full(fd
, todo_list
->buf
.buf
+ offset
,
1625 todo_list
->buf
.len
- offset
) < 0)
1626 return error_errno(_("could not write to '%s'"), todo_path
);
1627 if (commit_lock_file(&todo_lock
) < 0)
1628 return error(_("failed to finalize '%s'."), todo_path
);
1630 if (is_rebase_i(opts
)) {
1631 const char *done_path
= rebase_path_done();
1632 int fd
= open(done_path
, O_CREAT
| O_WRONLY
| O_APPEND
, 0666);
1633 int prev_offset
= !next
? 0 :
1634 todo_list
->items
[next
- 1].offset_in_buf
;
1636 if (fd
>= 0 && offset
> prev_offset
&&
1637 write_in_full(fd
, todo_list
->buf
.buf
+ prev_offset
,
1638 offset
- prev_offset
) < 0) {
1640 return error_errno(_("could not write to '%s'"),
1649 static int save_opts(struct replay_opts
*opts
)
1651 const char *opts_file
= git_path_opts_file();
1654 if (opts
->no_commit
)
1655 res
|= git_config_set_in_file_gently(opts_file
, "options.no-commit", "true");
1657 res
|= git_config_set_in_file_gently(opts_file
, "options.edit", "true");
1659 res
|= git_config_set_in_file_gently(opts_file
, "options.signoff", "true");
1660 if (opts
->record_origin
)
1661 res
|= git_config_set_in_file_gently(opts_file
, "options.record-origin", "true");
1663 res
|= git_config_set_in_file_gently(opts_file
, "options.allow-ff", "true");
1664 if (opts
->mainline
) {
1665 struct strbuf buf
= STRBUF_INIT
;
1666 strbuf_addf(&buf
, "%d", opts
->mainline
);
1667 res
|= git_config_set_in_file_gently(opts_file
, "options.mainline", buf
.buf
);
1668 strbuf_release(&buf
);
1671 res
|= git_config_set_in_file_gently(opts_file
, "options.strategy", opts
->strategy
);
1673 res
|= git_config_set_in_file_gently(opts_file
, "options.gpg-sign", opts
->gpg_sign
);
1676 for (i
= 0; i
< opts
->xopts_nr
; i
++)
1677 res
|= git_config_set_multivar_in_file_gently(opts_file
,
1678 "options.strategy-option",
1679 opts
->xopts
[i
], "^$", 0);
1684 static int make_patch(struct commit
*commit
, struct replay_opts
*opts
)
1686 struct strbuf buf
= STRBUF_INIT
;
1687 struct rev_info log_tree_opt
;
1688 const char *subject
, *p
;
1691 p
= short_commit_name(commit
);
1692 if (write_message(p
, strlen(p
), rebase_path_stopped_sha(), 1) < 0)
1695 strbuf_addf(&buf
, "%s/patch", get_dir(opts
));
1696 memset(&log_tree_opt
, 0, sizeof(log_tree_opt
));
1697 init_revisions(&log_tree_opt
, NULL
);
1698 log_tree_opt
.abbrev
= 0;
1699 log_tree_opt
.diff
= 1;
1700 log_tree_opt
.diffopt
.output_format
= DIFF_FORMAT_PATCH
;
1701 log_tree_opt
.disable_stdin
= 1;
1702 log_tree_opt
.no_commit_id
= 1;
1703 log_tree_opt
.diffopt
.file
= fopen(buf
.buf
, "w");
1704 log_tree_opt
.diffopt
.use_color
= GIT_COLOR_NEVER
;
1705 if (!log_tree_opt
.diffopt
.file
)
1706 res
|= error_errno(_("could not open '%s'"), buf
.buf
);
1708 res
|= log_tree_commit(&log_tree_opt
, commit
);
1709 fclose(log_tree_opt
.diffopt
.file
);
1713 strbuf_addf(&buf
, "%s/message", get_dir(opts
));
1714 if (!file_exists(buf
.buf
)) {
1715 const char *commit_buffer
= get_commit_buffer(commit
, NULL
);
1716 find_commit_subject(commit_buffer
, &subject
);
1717 res
|= write_message(subject
, strlen(subject
), buf
.buf
, 1);
1718 unuse_commit_buffer(commit
, commit_buffer
);
1720 strbuf_release(&buf
);
1725 static int intend_to_amend(void)
1727 unsigned char head
[20];
1730 if (get_sha1("HEAD", head
))
1731 return error(_("cannot read HEAD"));
1733 p
= sha1_to_hex(head
);
1734 return write_message(p
, strlen(p
), rebase_path_amend(), 1);
1737 static int error_with_patch(struct commit
*commit
,
1738 const char *subject
, int subject_len
,
1739 struct replay_opts
*opts
, int exit_code
, int to_amend
)
1741 if (make_patch(commit
, opts
))
1745 if (intend_to_amend())
1748 fprintf(stderr
, "You can amend the commit now, with\n"
1750 " git commit --amend %s\n"
1752 "Once you are satisfied with your changes, run\n"
1754 " git rebase --continue\n", gpg_sign_opt_quoted(opts
));
1755 } else if (exit_code
)
1756 fprintf(stderr
, "Could not apply %s... %.*s\n",
1757 short_commit_name(commit
), subject_len
, subject
);
1762 static int error_failed_squash(struct commit
*commit
,
1763 struct replay_opts
*opts
, int subject_len
, const char *subject
)
1765 if (rename(rebase_path_squash_msg(), rebase_path_message()))
1766 return error(_("could not rename '%s' to '%s'"),
1767 rebase_path_squash_msg(), rebase_path_message());
1768 unlink(rebase_path_fixup_msg());
1769 unlink(git_path("MERGE_MSG"));
1770 if (copy_file(git_path("MERGE_MSG"), rebase_path_message(), 0666))
1771 return error(_("could not copy '%s' to '%s'"),
1772 rebase_path_message(), git_path("MERGE_MSG"));
1773 return error_with_patch(commit
, subject
, subject_len
, opts
, 1, 0);
1776 static int do_exec(const char *command_line
)
1778 const char *child_argv
[] = { NULL
, NULL
};
1781 fprintf(stderr
, "Executing: %s\n", command_line
);
1782 child_argv
[0] = command_line
;
1783 status
= run_command_v_opt(child_argv
, RUN_USING_SHELL
);
1785 /* force re-reading of the cache */
1786 if (discard_cache() < 0 || read_cache() < 0)
1787 return error(_("could not read index"));
1789 dirty
= require_clean_work_tree("rebase", NULL
, 1, 1);
1792 warning(_("execution failed: %s\n%s"
1793 "You can fix the problem, and then run\n"
1795 " git rebase --continue\n"
1798 dirty
? N_("and made changes to the index and/or the "
1799 "working tree\n") : "");
1801 /* command not found */
1804 warning(_("execution succeeded: %s\nbut "
1805 "left changes to the index and/or the working tree\n"
1806 "Commit or stash your changes, and then run\n"
1808 " git rebase --continue\n"
1809 "\n"), command_line
);
1816 static int is_final_fixup(struct todo_list
*todo_list
)
1818 int i
= todo_list
->current
;
1820 if (!is_fixup(todo_list
->items
[i
].command
))
1823 while (++i
< todo_list
->nr
)
1824 if (is_fixup(todo_list
->items
[i
].command
))
1826 else if (!is_noop(todo_list
->items
[i
].command
))
1831 static enum todo_command
peek_command(struct todo_list
*todo_list
, int offset
)
1835 for (i
= todo_list
->current
+ offset
; i
< todo_list
->nr
; i
++)
1836 if (!is_noop(todo_list
->items
[i
].command
))
1837 return todo_list
->items
[i
].command
;
1842 static int apply_autostash(struct replay_opts
*opts
)
1844 struct strbuf stash_sha1
= STRBUF_INIT
;
1845 struct child_process child
= CHILD_PROCESS_INIT
;
1848 if (!read_oneliner(&stash_sha1
, rebase_path_autostash(), 1)) {
1849 strbuf_release(&stash_sha1
);
1852 strbuf_trim(&stash_sha1
);
1855 argv_array_push(&child
.args
, "stash");
1856 argv_array_push(&child
.args
, "apply");
1857 argv_array_push(&child
.args
, stash_sha1
.buf
);
1858 if (!run_command(&child
))
1859 printf(_("Applied autostash."));
1861 struct child_process store
= CHILD_PROCESS_INIT
;
1864 argv_array_push(&store
.args
, "stash");
1865 argv_array_push(&store
.args
, "store");
1866 argv_array_push(&store
.args
, "-m");
1867 argv_array_push(&store
.args
, "autostash");
1868 argv_array_push(&store
.args
, "-q");
1869 argv_array_push(&store
.args
, stash_sha1
.buf
);
1870 if (run_command(&store
))
1871 ret
= error(_("cannot store %s"), stash_sha1
.buf
);
1873 printf(_("Applying autostash resulted in conflicts.\n"
1874 "Your changes are safe in the stash.\n"
1875 "You can run \"git stash pop\" or"
1876 " \"git stash drop\" at any time.\n"));
1879 strbuf_release(&stash_sha1
);
1883 static const char *reflog_message(struct replay_opts
*opts
,
1884 const char *sub_action
, const char *fmt
, ...)
1887 static struct strbuf buf
= STRBUF_INIT
;
1891 strbuf_addstr(&buf
, action_name(opts
));
1893 strbuf_addf(&buf
, " (%s)", sub_action
);
1895 strbuf_addstr(&buf
, ": ");
1896 strbuf_vaddf(&buf
, fmt
, ap
);
1903 static int pick_commits(struct todo_list
*todo_list
, struct replay_opts
*opts
)
1907 setenv(GIT_REFLOG_ACTION
, action_name(opts
), 0);
1909 assert(!(opts
->signoff
|| opts
->no_commit
||
1910 opts
->record_origin
|| opts
->edit
));
1911 if (read_and_refresh_cache(opts
))
1914 while (todo_list
->current
< todo_list
->nr
) {
1915 struct todo_item
*item
= todo_list
->items
+ todo_list
->current
;
1916 if (save_todo(todo_list
, opts
))
1918 if (is_rebase_i(opts
)) {
1919 unlink(rebase_path_message());
1920 unlink(rebase_path_author_script());
1921 unlink(rebase_path_stopped_sha());
1922 unlink(rebase_path_amend());
1924 if (item
->command
<= TODO_SQUASH
) {
1925 if (is_rebase_i(opts
))
1926 setenv("GIT_REFLOG_ACTION", reflog_message(opts
,
1927 command_to_string(item
->command
), NULL
),
1929 res
= do_pick_commit(item
->command
, item
->commit
,
1930 opts
, is_final_fixup(todo_list
));
1931 if (is_rebase_i(opts
) && res
< 0) {
1933 todo_list
->current
--;
1934 if (save_todo(todo_list
, opts
))
1937 if (item
->command
== TODO_EDIT
) {
1938 struct commit
*commit
= item
->commit
;
1940 warning(_("stopped at %s... %.*s"),
1941 short_commit_name(commit
),
1942 item
->arg_len
, item
->arg
);
1943 return error_with_patch(commit
,
1944 item
->arg
, item
->arg_len
, opts
, res
,
1947 if (is_rebase_i(opts
) && !res
)
1948 record_in_rewritten(&item
->commit
->object
.oid
,
1949 peek_command(todo_list
, 1));
1950 if (res
&& is_fixup(item
->command
)) {
1953 return error_failed_squash(item
->commit
, opts
,
1954 item
->arg_len
, item
->arg
);
1955 } else if (res
&& is_rebase_i(opts
))
1956 return res
| error_with_patch(item
->commit
,
1957 item
->arg
, item
->arg_len
, opts
, res
,
1958 item
->command
== TODO_REWORD
);
1959 } else if (item
->command
== TODO_EXEC
) {
1960 char *end_of_arg
= (char *)(item
->arg
+ item
->arg_len
);
1961 int saved
= *end_of_arg
;
1964 res
= do_exec(item
->arg
);
1965 *end_of_arg
= saved
;
1966 } else if (!is_noop(item
->command
))
1967 return error(_("unknown command %d"), item
->command
);
1969 todo_list
->current
++;
1974 if (is_rebase_i(opts
)) {
1975 struct strbuf head_ref
= STRBUF_INIT
, buf
= STRBUF_INIT
;
1978 /* Stopped in the middle, as planned? */
1979 if (todo_list
->current
< todo_list
->nr
)
1982 if (read_oneliner(&head_ref
, rebase_path_head_name(), 0) &&
1983 starts_with(head_ref
.buf
, "refs/")) {
1985 unsigned char head
[20], orig
[20];
1988 if (get_sha1("HEAD", head
)) {
1989 res
= error(_("cannot read HEAD"));
1991 strbuf_release(&head_ref
);
1992 strbuf_release(&buf
);
1995 if (!read_oneliner(&buf
, rebase_path_orig_head(), 0) ||
1996 get_sha1_hex(buf
.buf
, orig
)) {
1997 res
= error(_("could not read orig-head"));
1998 goto cleanup_head_ref
;
2000 if (!read_oneliner(&buf
, rebase_path_onto(), 0)) {
2001 res
= error(_("could not read 'onto'"));
2002 goto cleanup_head_ref
;
2004 msg
= reflog_message(opts
, "finish", "%s onto %s",
2005 head_ref
.buf
, buf
.buf
);
2006 if (update_ref(msg
, head_ref
.buf
, head
, orig
,
2007 REF_NODEREF
, UPDATE_REFS_MSG_ON_ERR
)) {
2008 res
= error(_("could not update %s"),
2010 goto cleanup_head_ref
;
2012 msg
= reflog_message(opts
, "finish", "returning to %s",
2014 if (create_symref("HEAD", head_ref
.buf
, msg
)) {
2015 res
= error(_("could not update HEAD to %s"),
2017 goto cleanup_head_ref
;
2022 if (opts
->verbose
) {
2023 struct rev_info log_tree_opt
;
2024 struct object_id orig
, head
;
2026 memset(&log_tree_opt
, 0, sizeof(log_tree_opt
));
2027 init_revisions(&log_tree_opt
, NULL
);
2028 log_tree_opt
.diff
= 1;
2029 log_tree_opt
.diffopt
.output_format
=
2030 DIFF_FORMAT_DIFFSTAT
;
2031 log_tree_opt
.disable_stdin
= 1;
2033 if (read_oneliner(&buf
, rebase_path_orig_head(), 0) &&
2034 !get_sha1(buf
.buf
, orig
.hash
) &&
2035 !get_sha1("HEAD", head
.hash
)) {
2036 diff_tree_sha1(orig
.hash
, head
.hash
,
2037 "", &log_tree_opt
.diffopt
);
2038 log_tree_diff_flush(&log_tree_opt
);
2041 flush_rewritten_pending();
2042 if (!stat(rebase_path_rewritten_list(), &st
) &&
2044 struct child_process child
= CHILD_PROCESS_INIT
;
2045 const char *post_rewrite_hook
=
2046 find_hook("post-rewrite");
2048 child
.in
= open(rebase_path_rewritten_list(), O_RDONLY
);
2050 argv_array_push(&child
.args
, "notes");
2051 argv_array_push(&child
.args
, "copy");
2052 argv_array_push(&child
.args
, "--for-rewrite=rebase");
2053 /* we don't care if this copying failed */
2054 run_command(&child
);
2056 if (post_rewrite_hook
) {
2057 struct child_process hook
= CHILD_PROCESS_INIT
;
2059 hook
.in
= open(rebase_path_rewritten_list(),
2061 hook
.stdout_to_stderr
= 1;
2062 argv_array_push(&hook
.args
, post_rewrite_hook
);
2063 argv_array_push(&hook
.args
, "rebase");
2064 /* we don't care if this hook failed */
2068 apply_autostash(opts
);
2070 strbuf_release(&buf
);
2071 strbuf_release(&head_ref
);
2075 * Sequence of picks finished successfully; cleanup by
2076 * removing the .git/sequencer directory
2078 return sequencer_remove_state(opts
);
2081 static int continue_single_pick(void)
2083 const char *argv
[] = { "commit", NULL
};
2085 if (!file_exists(git_path_cherry_pick_head()) &&
2086 !file_exists(git_path_revert_head()))
2087 return error(_("no cherry-pick or revert in progress"));
2088 return run_command_v_opt(argv
, RUN_GIT_CMD
);
2091 static int commit_staged_changes(struct replay_opts
*opts
)
2095 if (has_unstaged_changes(1))
2096 return error(_("cannot rebase: You have unstaged changes."));
2097 if (!has_uncommitted_changes(0)) {
2098 const char *cherry_pick_head
= git_path("CHERRY_PICK_HEAD");
2100 if (file_exists(cherry_pick_head
) && unlink(cherry_pick_head
))
2101 return error(_("could not remove CHERRY_PICK_HEAD"));
2105 if (file_exists(rebase_path_amend())) {
2106 struct strbuf rev
= STRBUF_INIT
;
2107 unsigned char head
[20], to_amend
[20];
2109 if (get_sha1("HEAD", head
))
2110 return error(_("cannot amend non-existing commit"));
2111 if (!read_oneliner(&rev
, rebase_path_amend(), 0))
2112 return error(_("invalid file: '%s'"), rebase_path_amend());
2113 if (get_sha1_hex(rev
.buf
, to_amend
))
2114 return error(_("invalid contents: '%s'"),
2115 rebase_path_amend());
2116 if (hashcmp(head
, to_amend
))
2117 return error(_("\nYou have uncommitted changes in your "
2118 "working tree. Please, commit them\n"
2119 "first and then run 'git rebase "
2120 "--continue' again."));
2122 strbuf_release(&rev
);
2126 if (run_git_commit(rebase_path_message(), opts
, 1, 1, amend
, 0))
2127 return error(_("could not commit staged changes."));
2128 unlink(rebase_path_amend());
2132 int sequencer_continue(struct replay_opts
*opts
)
2134 struct todo_list todo_list
= TODO_LIST_INIT
;
2137 if (read_and_refresh_cache(opts
))
2140 if (is_rebase_i(opts
)) {
2141 if (commit_staged_changes(opts
))
2143 } else if (!file_exists(get_todo_path(opts
)))
2144 return continue_single_pick();
2145 if (read_populate_opts(opts
))
2147 if ((res
= read_populate_todo(&todo_list
, opts
)))
2148 goto release_todo_list
;
2150 if (!is_rebase_i(opts
)) {
2151 /* Verify that the conflict has been resolved */
2152 if (file_exists(git_path_cherry_pick_head()) ||
2153 file_exists(git_path_revert_head())) {
2154 res
= continue_single_pick();
2156 goto release_todo_list
;
2158 if (index_differs_from("HEAD", 0, 0)) {
2159 res
= error_dirty_index(opts
);
2160 goto release_todo_list
;
2162 todo_list
.current
++;
2163 } else if (file_exists(rebase_path_stopped_sha())) {
2164 struct strbuf buf
= STRBUF_INIT
;
2165 struct object_id oid
;
2167 if (read_oneliner(&buf
, rebase_path_stopped_sha(), 1) &&
2168 !get_sha1_committish(buf
.buf
, oid
.hash
))
2169 record_in_rewritten(&oid
, peek_command(&todo_list
, 0));
2170 strbuf_release(&buf
);
2173 res
= pick_commits(&todo_list
, opts
);
2175 todo_list_release(&todo_list
);
2179 static int single_pick(struct commit
*cmit
, struct replay_opts
*opts
)
2181 setenv(GIT_REFLOG_ACTION
, action_name(opts
), 0);
2182 return do_pick_commit(opts
->action
== REPLAY_PICK
?
2183 TODO_PICK
: TODO_REVERT
, cmit
, opts
, 0);
2186 int sequencer_pick_revisions(struct replay_opts
*opts
)
2188 struct todo_list todo_list
= TODO_LIST_INIT
;
2189 unsigned char sha1
[20];
2193 if (read_and_refresh_cache(opts
))
2196 for (i
= 0; i
< opts
->revs
->pending
.nr
; i
++) {
2197 unsigned char sha1
[20];
2198 const char *name
= opts
->revs
->pending
.objects
[i
].name
;
2200 /* This happens when using --stdin. */
2204 if (!get_sha1(name
, sha1
)) {
2205 if (!lookup_commit_reference_gently(sha1
, 1)) {
2206 enum object_type type
= sha1_object_info(sha1
, NULL
);
2207 return error(_("%s: can't cherry-pick a %s"),
2208 name
, typename(type
));
2211 return error(_("%s: bad revision"), name
);
2215 * If we were called as "git cherry-pick <commit>", just
2216 * cherry-pick/revert it, set CHERRY_PICK_HEAD /
2217 * REVERT_HEAD, and don't touch the sequencer state.
2218 * This means it is possible to cherry-pick in the middle
2219 * of a cherry-pick sequence.
2221 if (opts
->revs
->cmdline
.nr
== 1 &&
2222 opts
->revs
->cmdline
.rev
->whence
== REV_CMD_REV
&&
2223 opts
->revs
->no_walk
&&
2224 !opts
->revs
->cmdline
.rev
->flags
) {
2225 struct commit
*cmit
;
2226 if (prepare_revision_walk(opts
->revs
))
2227 return error(_("revision walk setup failed"));
2228 cmit
= get_revision(opts
->revs
);
2229 if (!cmit
|| get_revision(opts
->revs
))
2230 return error("BUG: expected exactly one commit from walk");
2231 return single_pick(cmit
, opts
);
2235 * Start a new cherry-pick/ revert sequence; but
2236 * first, make sure that an existing one isn't in
2240 if (walk_revs_populate_todo(&todo_list
, opts
) ||
2241 create_seq_dir() < 0)
2243 if (get_sha1("HEAD", sha1
) && (opts
->action
== REPLAY_REVERT
))
2244 return error(_("can't revert as initial commit"));
2245 if (save_head(sha1_to_hex(sha1
)))
2247 if (save_opts(opts
))
2249 update_abort_safety_file();
2250 res
= pick_commits(&todo_list
, opts
);
2251 todo_list_release(&todo_list
);
2255 void append_signoff(struct strbuf
*msgbuf
, int ignore_footer
, unsigned flag
)
2257 unsigned no_dup_sob
= flag
& APPEND_SIGNOFF_DEDUP
;
2258 struct strbuf sob
= STRBUF_INIT
;
2261 strbuf_addstr(&sob
, sign_off_header
);
2262 strbuf_addstr(&sob
, fmt_name(getenv("GIT_COMMITTER_NAME"),
2263 getenv("GIT_COMMITTER_EMAIL")));
2264 strbuf_addch(&sob
, '\n');
2267 * If the whole message buffer is equal to the sob, pretend that we
2268 * found a conforming footer with a matching sob
2270 if (msgbuf
->len
- ignore_footer
== sob
.len
&&
2271 !strncmp(msgbuf
->buf
, sob
.buf
, sob
.len
))
2274 has_footer
= has_conforming_footer(msgbuf
, &sob
, ignore_footer
);
2277 const char *append_newlines
= NULL
;
2278 size_t len
= msgbuf
->len
- ignore_footer
;
2282 * The buffer is completely empty. Leave foom for
2283 * the title and body to be filled in by the user.
2285 append_newlines
= "\n\n";
2286 } else if (msgbuf
->buf
[len
- 1] != '\n') {
2288 * Incomplete line. Complete the line and add a
2289 * blank one so that there is an empty line between
2290 * the message body and the sob.
2292 append_newlines
= "\n\n";
2293 } else if (len
== 1) {
2295 * Buffer contains a single newline. Add another
2296 * so that we leave room for the title and body.
2298 append_newlines
= "\n";
2299 } else if (msgbuf
->buf
[len
- 2] != '\n') {
2301 * Buffer ends with a single newline. Add another
2302 * so that there is an empty line between the message
2305 append_newlines
= "\n";
2306 } /* else, the buffer already ends with two newlines. */
2308 if (append_newlines
)
2309 strbuf_splice(msgbuf
, msgbuf
->len
- ignore_footer
, 0,
2310 append_newlines
, strlen(append_newlines
));
2313 if (has_footer
!= 3 && (!no_dup_sob
|| has_footer
!= 2))
2314 strbuf_splice(msgbuf
, msgbuf
->len
- ignore_footer
, 0,
2317 strbuf_release(&sob
);