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)";
437 head_tree
= parse_tree_indirect(head
);
438 next_tree
= next
? next
->tree
: empty_tree();
439 base_tree
= base
? base
->tree
: empty_tree();
441 for (xopt
= opts
->xopts
; xopt
!= opts
->xopts
+ opts
->xopts_nr
; xopt
++)
442 parse_merge_opt(&o
, *xopt
);
444 clean
= merge_trees(&o
,
446 next_tree
, base_tree
, &result
);
447 strbuf_release(&o
.obuf
);
451 if (active_cache_changed
&&
452 write_locked_index(&the_index
, &index_lock
, COMMIT_LOCK
))
453 /* TRANSLATORS: %s will be "revert", "cherry-pick" or
456 return error(_("%s: Unable to write new index file"),
457 _(action_name(opts
)));
458 rollback_lock_file(&index_lock
);
461 append_signoff(msgbuf
, 0, 0);
464 append_conflicts_hint(msgbuf
);
469 static int is_index_unchanged(void)
471 unsigned char head_sha1
[20];
472 struct commit
*head_commit
;
474 if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING
, head_sha1
, NULL
))
475 return error(_("could not resolve HEAD commit\n"));
477 head_commit
= lookup_commit(head_sha1
);
480 * If head_commit is NULL, check_commit, called from
481 * lookup_commit, would have indicated that head_commit is not
482 * a commit object already. parse_commit() will return failure
483 * without further complaints in such a case. Otherwise, if
484 * the commit is invalid, parse_commit() will complain. So
485 * there is nothing for us to say here. Just return failure.
487 if (parse_commit(head_commit
))
490 if (!active_cache_tree
)
491 active_cache_tree
= cache_tree();
493 if (!cache_tree_fully_valid(active_cache_tree
))
494 if (cache_tree_update(&the_index
, 0))
495 return error(_("unable to update cache tree\n"));
497 return !hashcmp(active_cache_tree
->sha1
, head_commit
->tree
->object
.oid
.hash
);
500 static int write_author_script(const char *message
)
502 struct strbuf buf
= STRBUF_INIT
;
507 if (!*message
|| starts_with(message
, "\n")) {
509 /* Missing 'author' line? */
510 unlink(rebase_path_author_script());
512 } else if (skip_prefix(message
, "author ", &message
))
514 else if ((eol
= strchr(message
, '\n')))
519 strbuf_addstr(&buf
, "GIT_AUTHOR_NAME='");
520 while (*message
&& *message
!= '\n' && *message
!= '\r')
521 if (skip_prefix(message
, " <", &message
))
523 else if (*message
!= '\'')
524 strbuf_addch(&buf
, *(message
++));
526 strbuf_addf(&buf
, "'\\\\%c'", *(message
++));
527 strbuf_addstr(&buf
, "'\nGIT_AUTHOR_EMAIL='");
528 while (*message
&& *message
!= '\n' && *message
!= '\r')
529 if (skip_prefix(message
, "> ", &message
))
531 else if (*message
!= '\'')
532 strbuf_addch(&buf
, *(message
++));
534 strbuf_addf(&buf
, "'\\\\%c'", *(message
++));
535 strbuf_addstr(&buf
, "'\nGIT_AUTHOR_DATE='@");
536 while (*message
&& *message
!= '\n' && *message
!= '\r')
537 if (*message
!= '\'')
538 strbuf_addch(&buf
, *(message
++));
540 strbuf_addf(&buf
, "'\\\\%c'", *(message
++));
541 res
= write_message(buf
.buf
, buf
.len
, rebase_path_author_script(), 1);
542 strbuf_release(&buf
);
547 * Read a list of environment variable assignments (such as the author-script
548 * file) into an environment block. Returns -1 on error, 0 otherwise.
550 static int read_env_script(struct argv_array
*env
)
552 struct strbuf script
= STRBUF_INIT
;
556 if (strbuf_read_file(&script
, rebase_path_author_script(), 256) <= 0)
559 for (p
= script
.buf
; *p
; p
++)
560 if (skip_prefix(p
, "'\\\\''", (const char **)&p2
))
561 strbuf_splice(&script
, p
- script
.buf
, p2
- p
, "'", 1);
563 strbuf_splice(&script
, p
-- - script
.buf
, 1, "", 0);
564 else if (*p
== '\n') {
569 for (i
= 0, p
= script
.buf
; i
< count
; i
++) {
570 argv_array_push(env
, p
);
577 static const char staged_changes_advice
[] =
578 N_("you have staged changes in your working tree\n"
579 "If these changes are meant to be squashed into the previous commit, run:\n"
581 " git commit --amend %s\n"
583 "If they are meant to go into a new commit, run:\n"
587 "In both cases, once you're done, continue with:\n"
589 " git rebase --continue\n");
592 * If we are cherry-pick, and if the merge did not result in
593 * hand-editing, we will hit this commit and inherit the original
594 * author date and name.
596 * If we are revert, or if our cherry-pick results in a hand merge,
597 * we had better say that the current user is responsible for that.
599 * An exception is when run_git_commit() is called during an
600 * interactive rebase: in that case, we will want to retain the
603 static int run_git_commit(const char *defmsg
, struct replay_opts
*opts
,
604 int allow_empty
, int edit
, int amend
,
605 int cleanup_commit_message
)
607 struct child_process cmd
= CHILD_PROCESS_INIT
;
612 if (is_rebase_i(opts
)) {
613 if (read_env_script(&cmd
.env_array
)) {
614 const char *gpg_opt
= gpg_sign_opt_quoted(opts
);
616 return error(_(staged_changes_advice
),
621 argv_array_push(&cmd
.args
, "commit");
622 argv_array_push(&cmd
.args
, "-n");
625 argv_array_push(&cmd
.args
, "--amend");
627 argv_array_pushf(&cmd
.args
, "-S%s", opts
->gpg_sign
);
629 argv_array_push(&cmd
.args
, "-s");
631 argv_array_pushl(&cmd
.args
, "-F", defmsg
, NULL
);
632 if (cleanup_commit_message
)
633 argv_array_push(&cmd
.args
, "--cleanup=strip");
635 argv_array_push(&cmd
.args
, "-e");
636 else if (!cleanup_commit_message
&&
637 !opts
->signoff
&& !opts
->record_origin
&&
638 git_config_get_value("commit.cleanup", &value
))
639 argv_array_push(&cmd
.args
, "--cleanup=verbatim");
642 argv_array_push(&cmd
.args
, "--allow-empty");
644 if (opts
->allow_empty_message
)
645 argv_array_push(&cmd
.args
, "--allow-empty-message");
648 return run_command(&cmd
);
651 static int is_original_commit_empty(struct commit
*commit
)
653 const unsigned char *ptree_sha1
;
655 if (parse_commit(commit
))
656 return error(_("could not parse commit %s\n"),
657 oid_to_hex(&commit
->object
.oid
));
658 if (commit
->parents
) {
659 struct commit
*parent
= commit
->parents
->item
;
660 if (parse_commit(parent
))
661 return error(_("could not parse parent commit %s\n"),
662 oid_to_hex(&parent
->object
.oid
));
663 ptree_sha1
= parent
->tree
->object
.oid
.hash
;
665 ptree_sha1
= EMPTY_TREE_SHA1_BIN
; /* commit is root */
668 return !hashcmp(ptree_sha1
, commit
->tree
->object
.oid
.hash
);
672 * Do we run "git commit" with "--allow-empty"?
674 static int allow_empty(struct replay_opts
*opts
, struct commit
*commit
)
676 int index_unchanged
, empty_commit
;
681 * (1) we do not allow empty at all and error out.
683 * (2) we allow ones that were initially empty, but
684 * forbid the ones that become empty;
688 if (!opts
->allow_empty
)
689 return 0; /* let "git commit" barf as necessary */
691 index_unchanged
= is_index_unchanged();
692 if (index_unchanged
< 0)
693 return index_unchanged
;
694 if (!index_unchanged
)
695 return 0; /* we do not have to say --allow-empty */
697 if (opts
->keep_redundant_commits
)
700 empty_commit
= is_original_commit_empty(commit
);
701 if (empty_commit
< 0)
710 * Note that ordering matters in this enum. Not only must it match the mapping
711 * below, it is also divided into several sections that matter. When adding
712 * new commands, make sure you add it in the right section.
715 /* commands that handle commits */
722 /* commands that do something else than handling a single commit */
724 /* commands that do nothing but are counted for reporting progress */
727 /* comments (not counted for reporting progress) */
734 } todo_command_info
[] = {
747 static const char *command_to_string(const enum todo_command command
)
749 if (command
< TODO_COMMENT
)
750 return todo_command_info
[command
].str
;
751 die("Unknown command: %d", command
);
754 static int is_noop(const enum todo_command command
)
756 return TODO_NOOP
<= command
;
759 static int is_fixup(enum todo_command command
)
761 return command
== TODO_FIXUP
|| command
== TODO_SQUASH
;
764 static int update_squash_messages(enum todo_command command
,
765 struct commit
*commit
, struct replay_opts
*opts
)
767 struct strbuf buf
= STRBUF_INIT
;
769 const char *message
, *body
;
771 if (file_exists(rebase_path_squash_msg())) {
772 struct strbuf header
= STRBUF_INIT
;
775 if (strbuf_read_file(&buf
, rebase_path_squash_msg(), 2048) <= 0)
776 return error(_("could not read '%s'"),
777 rebase_path_squash_msg());
780 eol
= strchrnul(buf
.buf
, '\n');
781 if (buf
.buf
[0] != comment_line_char
||
782 (p
+= strcspn(p
, "0123456789\n")) == eol
)
783 return error(_("unexpected 1st line of squash message:"
785 (int)(eol
- buf
.buf
), buf
.buf
);
786 count
= strtol(p
, NULL
, 10);
789 return error(_("invalid 1st line of squash message:\n"
791 (int)(eol
- buf
.buf
), buf
.buf
);
793 strbuf_addf(&header
, "%c ", comment_line_char
);
795 _("This is a combination of %d commits."), ++count
);
796 strbuf_splice(&buf
, 0, eol
- buf
.buf
, header
.buf
, header
.len
);
797 strbuf_release(&header
);
799 unsigned char head
[20];
800 struct commit
*head_commit
;
801 const char *head_message
, *body
;
803 if (get_sha1("HEAD", head
))
804 return error(_("need a HEAD to fixup"));
805 if (!(head_commit
= lookup_commit_reference(head
)))
806 return error(_("could not read HEAD"));
807 if (!(head_message
= get_commit_buffer(head_commit
, NULL
)))
808 return error(_("could not read HEAD's commit message"));
810 find_commit_subject(head_message
, &body
);
811 if (write_message(body
, strlen(body
),
812 rebase_path_fixup_msg(), 0)) {
813 unuse_commit_buffer(head_commit
, head_message
);
814 return error(_("cannot write '%s'"),
815 rebase_path_fixup_msg());
819 strbuf_addf(&buf
, "%c ", comment_line_char
);
820 strbuf_addf(&buf
, _("This is a combination of %d commits."),
822 strbuf_addf(&buf
, "\n%c ", comment_line_char
);
823 strbuf_addstr(&buf
, _("This is the 1st commit message:"));
824 strbuf_addstr(&buf
, "\n\n");
825 strbuf_addstr(&buf
, body
);
827 unuse_commit_buffer(head_commit
, head_message
);
830 if (!(message
= get_commit_buffer(commit
, NULL
)))
831 return error(_("could not read commit message of %s"),
832 oid_to_hex(&commit
->object
.oid
));
833 find_commit_subject(message
, &body
);
835 if (command
== TODO_SQUASH
) {
836 unlink(rebase_path_fixup_msg());
837 strbuf_addf(&buf
, "\n%c ", comment_line_char
);
838 strbuf_addf(&buf
, _("This is the commit message #%d:"), count
);
839 strbuf_addstr(&buf
, "\n\n");
840 strbuf_addstr(&buf
, body
);
841 } else if (command
== TODO_FIXUP
) {
842 strbuf_addf(&buf
, "\n%c ", comment_line_char
);
843 strbuf_addf(&buf
, _("The commit message #%d will be skipped:"),
845 strbuf_addstr(&buf
, "\n\n");
846 strbuf_add_commented_lines(&buf
, body
, strlen(body
));
848 return error(_("unknown command: %d"), command
);
849 unuse_commit_buffer(commit
, message
);
851 res
= write_message(buf
.buf
, buf
.len
, rebase_path_squash_msg(), 0);
852 strbuf_release(&buf
);
856 static void flush_rewritten_pending(void) {
857 struct strbuf buf
= STRBUF_INIT
;
858 unsigned char newsha1
[20];
861 if (strbuf_read_file(&buf
, rebase_path_rewritten_pending(), 82) > 0 &&
862 !get_sha1("HEAD", newsha1
) &&
863 (out
= fopen(rebase_path_rewritten_list(), "a"))) {
864 char *bol
= buf
.buf
, *eol
;
867 eol
= strchrnul(bol
, '\n');
868 fprintf(out
, "%.*s %s\n", (int)(eol
- bol
),
869 bol
, sha1_to_hex(newsha1
));
875 unlink(rebase_path_rewritten_pending());
877 strbuf_release(&buf
);
880 static void record_in_rewritten(struct object_id
*oid
,
881 enum todo_command next_command
) {
882 FILE *out
= fopen(rebase_path_rewritten_pending(), "a");
887 fprintf(out
, "%s\n", oid_to_hex(oid
));
890 if (!is_fixup(next_command
))
891 flush_rewritten_pending();
894 static int do_pick_commit(enum todo_command command
, struct commit
*commit
,
895 struct replay_opts
*opts
, int final_fixup
)
897 int edit
= opts
->edit
, cleanup_commit_message
= 0;
898 const char *msg_file
= edit
? NULL
: git_path_merge_msg();
899 unsigned char head
[20];
900 struct commit
*base
, *next
, *parent
;
901 const char *base_label
, *next_label
;
902 struct commit_message msg
= { NULL
, NULL
, NULL
, NULL
};
903 struct strbuf msgbuf
= STRBUF_INIT
;
904 int res
, unborn
= 0, amend
= 0, allow
= 0;
906 if (opts
->no_commit
) {
908 * We do not intend to commit immediately. We just want to
909 * merge the differences in, so let's compute the tree
910 * that represents the "current" state for merge-recursive
913 if (write_cache_as_tree(head
, 0, NULL
))
914 return error(_("your index file is unmerged."));
916 unborn
= get_sha1("HEAD", head
);
918 hashcpy(head
, EMPTY_TREE_SHA1_BIN
);
919 if (index_differs_from(unborn
? EMPTY_TREE_SHA1_HEX
: "HEAD", 0, 0))
920 return error_dirty_index(opts
);
924 if (!commit
->parents
)
926 else if (commit
->parents
->next
) {
927 /* Reverting or cherry-picking a merge commit */
929 struct commit_list
*p
;
932 return error(_("commit %s is a merge but no -m option was given."),
933 oid_to_hex(&commit
->object
.oid
));
935 for (cnt
= 1, p
= commit
->parents
;
936 cnt
!= opts
->mainline
&& p
;
939 if (cnt
!= opts
->mainline
|| !p
)
940 return error(_("commit %s does not have parent %d"),
941 oid_to_hex(&commit
->object
.oid
), opts
->mainline
);
943 } else if (0 < opts
->mainline
)
944 return error(_("mainline was specified but commit %s is not a merge."),
945 oid_to_hex(&commit
->object
.oid
));
947 parent
= commit
->parents
->item
;
949 if (get_message(commit
, &msg
) != 0)
950 return error(_("cannot get commit message for %s"),
951 oid_to_hex(&commit
->object
.oid
));
953 if (opts
->allow_ff
&& !is_fixup(command
) &&
954 ((parent
&& !hashcmp(parent
->object
.oid
.hash
, head
)) ||
955 (!parent
&& unborn
))) {
956 if (is_rebase_i(opts
))
957 write_author_script(msg
.message
);
958 res
= fast_forward_to(commit
->object
.oid
.hash
, head
, unborn
,
960 if (res
|| command
!= TODO_REWORD
)
964 goto fast_forward_edit
;
966 if (parent
&& parse_commit(parent
) < 0)
967 /* TRANSLATORS: The first %s will be a "todo" command like
968 "revert" or "pick", the second %s a SHA1. */
969 return error(_("%s: cannot parse parent commit %s"),
970 command_to_string(command
),
971 oid_to_hex(&parent
->object
.oid
));
974 * "commit" is an existing commit. We would want to apply
975 * the difference it introduces since its first parent "prev"
976 * on top of the current HEAD if we are cherry-pick. Or the
977 * reverse of it if we are revert.
980 if (command
== TODO_REVERT
) {
982 base_label
= msg
.label
;
984 next_label
= msg
.parent_label
;
985 strbuf_addstr(&msgbuf
, "Revert \"");
986 strbuf_addstr(&msgbuf
, msg
.subject
);
987 strbuf_addstr(&msgbuf
, "\"\n\nThis reverts commit ");
988 strbuf_addstr(&msgbuf
, oid_to_hex(&commit
->object
.oid
));
990 if (commit
->parents
&& commit
->parents
->next
) {
991 strbuf_addstr(&msgbuf
, ", reversing\nchanges made to ");
992 strbuf_addstr(&msgbuf
, oid_to_hex(&parent
->object
.oid
));
994 strbuf_addstr(&msgbuf
, ".\n");
999 base_label
= msg
.parent_label
;
1001 next_label
= msg
.label
;
1003 /* Append the commit log message to msgbuf. */
1004 if (find_commit_subject(msg
.message
, &p
))
1005 strbuf_addstr(&msgbuf
, p
);
1007 if (opts
->record_origin
) {
1008 if (!has_conforming_footer(&msgbuf
, NULL
, 0))
1009 strbuf_addch(&msgbuf
, '\n');
1010 strbuf_addstr(&msgbuf
, cherry_picked_prefix
);
1011 strbuf_addstr(&msgbuf
, oid_to_hex(&commit
->object
.oid
));
1012 strbuf_addstr(&msgbuf
, ")\n");
1016 if (command
== TODO_REWORD
)
1018 else if (is_fixup(command
)) {
1019 if (update_squash_messages(command
, commit
, opts
))
1023 msg_file
= rebase_path_squash_msg();
1024 else if (file_exists(rebase_path_fixup_msg())) {
1025 cleanup_commit_message
= 1;
1026 msg_file
= rebase_path_fixup_msg();
1028 const char *dest
= git_path("SQUASH_MSG");
1030 if (copy_file(dest
, rebase_path_squash_msg(), 0666))
1031 return error(_("could not rename '%s' to '%s'"),
1032 rebase_path_squash_msg(), dest
);
1033 unlink(git_path("MERGE_MSG"));
1039 if (is_rebase_i(opts
) && write_author_script(msg
.message
) < 0)
1041 else if (!opts
->strategy
|| !strcmp(opts
->strategy
, "recursive") || command
== TODO_REVERT
) {
1042 res
= do_recursive_merge(base
, next
, base_label
, next_label
,
1043 head
, &msgbuf
, opts
);
1046 res
|= write_message(msgbuf
.buf
, msgbuf
.len
,
1047 git_path_merge_msg(), 0);
1049 struct commit_list
*common
= NULL
;
1050 struct commit_list
*remotes
= NULL
;
1052 res
= write_message(msgbuf
.buf
, msgbuf
.len
,
1053 git_path_merge_msg(), 0);
1055 commit_list_insert(base
, &common
);
1056 commit_list_insert(next
, &remotes
);
1057 res
|= try_merge_command(opts
->strategy
,
1058 opts
->xopts_nr
, (const char **)opts
->xopts
,
1059 common
, sha1_to_hex(head
), remotes
);
1060 free_commit_list(common
);
1061 free_commit_list(remotes
);
1063 strbuf_release(&msgbuf
);
1066 * If the merge was clean or if it failed due to conflict, we write
1067 * CHERRY_PICK_HEAD for the subsequent invocation of commit to use.
1068 * However, if the merge did not even start, then we don't want to
1071 if (command
== TODO_PICK
&& !opts
->no_commit
&& (res
== 0 || res
== 1) &&
1072 update_ref(NULL
, "CHERRY_PICK_HEAD", commit
->object
.oid
.hash
, NULL
,
1073 REF_NODEREF
, UPDATE_REFS_MSG_ON_ERR
))
1075 if (command
== TODO_REVERT
&& ((opts
->no_commit
&& res
== 0) || res
== 1) &&
1076 update_ref(NULL
, "REVERT_HEAD", commit
->object
.oid
.hash
, NULL
,
1077 REF_NODEREF
, UPDATE_REFS_MSG_ON_ERR
))
1081 error(command
== TODO_REVERT
1082 ? _("could not revert %s... %s")
1083 : _("could not apply %s... %s"),
1084 short_commit_name(commit
), msg
.subject
);
1085 print_advice(res
== 1, opts
);
1086 rerere(opts
->allow_rerere_auto
);
1090 allow
= allow_empty(opts
, commit
);
1095 if (!opts
->no_commit
)
1097 res
= run_git_commit(msg_file
, opts
, allow
, edit
, amend
,
1098 cleanup_commit_message
);
1100 if (!res
&& final_fixup
) {
1101 unlink(rebase_path_fixup_msg());
1102 unlink(rebase_path_squash_msg());
1106 free_message(commit
, &msg
);
1107 update_abort_safety_file();
1112 static int prepare_revs(struct replay_opts
*opts
)
1115 * picking (but not reverting) ranges (but not individual revisions)
1116 * should be done in reverse
1118 if (opts
->action
== REPLAY_PICK
&& !opts
->revs
->no_walk
)
1119 opts
->revs
->reverse
^= 1;
1121 if (prepare_revision_walk(opts
->revs
))
1122 return error(_("revision walk setup failed"));
1124 if (!opts
->revs
->commits
)
1125 return error(_("empty commit set passed"));
1129 static int read_and_refresh_cache(struct replay_opts
*opts
)
1131 static struct lock_file index_lock
;
1132 int index_fd
= hold_locked_index(&index_lock
, 0);
1133 if (read_index_preload(&the_index
, NULL
) < 0) {
1134 rollback_lock_file(&index_lock
);
1135 return error(_("git %s: failed to read the index"),
1136 _(action_name(opts
)));
1138 refresh_index(&the_index
, REFRESH_QUIET
|REFRESH_UNMERGED
, NULL
, NULL
, NULL
);
1139 if (the_index
.cache_changed
&& index_fd
>= 0) {
1140 if (write_locked_index(&the_index
, &index_lock
, COMMIT_LOCK
)) {
1141 rollback_lock_file(&index_lock
);
1142 return error(_("git %s: failed to refresh the index"),
1143 _(action_name(opts
)));
1146 rollback_lock_file(&index_lock
);
1151 enum todo_command command
;
1152 struct commit
*commit
;
1155 size_t offset_in_buf
;
1160 struct todo_item
*items
;
1161 int nr
, alloc
, current
;
1164 #define TODO_LIST_INIT { STRBUF_INIT }
1166 static void todo_list_release(struct todo_list
*todo_list
)
1168 strbuf_release(&todo_list
->buf
);
1169 free(todo_list
->items
);
1170 todo_list
->items
= NULL
;
1171 todo_list
->nr
= todo_list
->alloc
= 0;
1174 static struct todo_item
*append_new_todo(struct todo_list
*todo_list
)
1176 ALLOC_GROW(todo_list
->items
, todo_list
->nr
+ 1, todo_list
->alloc
);
1177 return todo_list
->items
+ todo_list
->nr
++;
1180 static int parse_insn_line(struct todo_item
*item
, const char *bol
, char *eol
)
1182 unsigned char commit_sha1
[20];
1183 char *end_of_object_name
;
1184 int i
, saved
, status
, padding
;
1187 bol
+= strspn(bol
, " \t");
1189 if (bol
== eol
|| *bol
== '\r' || *bol
== comment_line_char
) {
1190 item
->command
= TODO_COMMENT
;
1191 item
->commit
= NULL
;
1193 item
->arg_len
= eol
- bol
;
1197 for (i
= 0; i
< TODO_COMMENT
; i
++)
1198 if (skip_prefix(bol
, todo_command_info
[i
].str
, &bol
)) {
1201 } else if (bol
[1] == ' ' && *bol
== todo_command_info
[i
].c
) {
1206 if (i
>= TODO_COMMENT
)
1209 if (item
->command
== TODO_NOOP
) {
1210 item
->commit
= NULL
;
1212 item
->arg_len
= eol
- bol
;
1216 /* Eat up extra spaces/ tabs before object name */
1217 padding
= strspn(bol
, " \t");
1222 if (item
->command
== TODO_EXEC
) {
1224 item
->arg_len
= (int)(eol
- bol
);
1228 end_of_object_name
= (char *) bol
+ strcspn(bol
, " \t\n");
1229 saved
= *end_of_object_name
;
1230 *end_of_object_name
= '\0';
1231 status
= get_sha1(bol
, commit_sha1
);
1232 *end_of_object_name
= saved
;
1234 item
->arg
= end_of_object_name
+ strspn(end_of_object_name
, " \t");
1235 item
->arg_len
= (int)(eol
- item
->arg
);
1240 item
->commit
= lookup_commit_reference(commit_sha1
);
1241 return !item
->commit
;
1244 static int parse_insn_buffer(char *buf
, struct todo_list
*todo_list
)
1246 struct todo_item
*item
;
1247 char *p
= buf
, *next_p
;
1248 int i
, res
= 0, fixup_okay
= file_exists(rebase_path_done());
1250 for (i
= 1; *p
; i
++, p
= next_p
) {
1251 char *eol
= strchrnul(p
, '\n');
1253 next_p
= *eol
? eol
+ 1 /* skip LF */ : eol
;
1255 if (p
!= eol
&& eol
[-1] == '\r')
1256 eol
--; /* strip Carriage Return */
1258 item
= append_new_todo(todo_list
);
1259 item
->offset_in_buf
= p
- todo_list
->buf
.buf
;
1260 if (parse_insn_line(item
, p
, eol
)) {
1261 res
= error(_("invalid line %d: %.*s"),
1262 i
, (int)(eol
- p
), p
);
1263 item
->command
= TODO_NOOP
;
1268 else if (is_fixup(item
->command
))
1269 return error(_("cannot '%s' without a previous commit"),
1270 command_to_string(item
->command
));
1271 else if (!is_noop(item
->command
))
1278 static int read_populate_todo(struct todo_list
*todo_list
,
1279 struct replay_opts
*opts
)
1281 const char *todo_file
= get_todo_path(opts
);
1284 strbuf_reset(&todo_list
->buf
);
1285 fd
= open(todo_file
, O_RDONLY
);
1287 return error_errno(_("could not open '%s'"), todo_file
);
1288 if (strbuf_read(&todo_list
->buf
, fd
, 0) < 0) {
1290 return error(_("could not read '%s'."), todo_file
);
1294 res
= parse_insn_buffer(todo_list
->buf
.buf
, todo_list
);
1296 return error(_("unusable instruction sheet: '%s'"), todo_file
);
1298 if (!todo_list
->nr
&&
1299 (!is_rebase_i(opts
) || !file_exists(rebase_path_done())))
1300 return error(_("no commits parsed."));
1302 if (!is_rebase_i(opts
)) {
1303 enum todo_command valid
=
1304 opts
->action
== REPLAY_PICK
? TODO_PICK
: TODO_REVERT
;
1307 for (i
= 0; i
< todo_list
->nr
; i
++)
1308 if (valid
== todo_list
->items
[i
].command
)
1310 else if (valid
== TODO_PICK
)
1311 return error(_("cannot cherry-pick during a revert."));
1313 return error(_("cannot revert during a cherry-pick."));
1319 static int git_config_string_dup(char **dest
,
1320 const char *var
, const char *value
)
1323 return config_error_nonbool(var
);
1325 *dest
= xstrdup(value
);
1329 static int populate_opts_cb(const char *key
, const char *value
, void *data
)
1331 struct replay_opts
*opts
= data
;
1336 else if (!strcmp(key
, "options.no-commit"))
1337 opts
->no_commit
= git_config_bool_or_int(key
, value
, &error_flag
);
1338 else if (!strcmp(key
, "options.edit"))
1339 opts
->edit
= git_config_bool_or_int(key
, value
, &error_flag
);
1340 else if (!strcmp(key
, "options.signoff"))
1341 opts
->signoff
= git_config_bool_or_int(key
, value
, &error_flag
);
1342 else if (!strcmp(key
, "options.record-origin"))
1343 opts
->record_origin
= git_config_bool_or_int(key
, value
, &error_flag
);
1344 else if (!strcmp(key
, "options.allow-ff"))
1345 opts
->allow_ff
= git_config_bool_or_int(key
, value
, &error_flag
);
1346 else if (!strcmp(key
, "options.mainline"))
1347 opts
->mainline
= git_config_int(key
, value
);
1348 else if (!strcmp(key
, "options.strategy"))
1349 git_config_string_dup(&opts
->strategy
, key
, value
);
1350 else if (!strcmp(key
, "options.gpg-sign"))
1351 git_config_string_dup(&opts
->gpg_sign
, key
, value
);
1352 else if (!strcmp(key
, "options.strategy-option")) {
1353 ALLOC_GROW(opts
->xopts
, opts
->xopts_nr
+ 1, opts
->xopts_alloc
);
1354 opts
->xopts
[opts
->xopts_nr
++] = xstrdup(value
);
1356 return error(_("invalid key: %s"), key
);
1359 return error(_("invalid value for %s: %s"), key
, value
);
1364 static void read_strategy_opts(struct replay_opts
*opts
, struct strbuf
*buf
)
1369 if (!read_oneliner(buf
, rebase_path_strategy(), 0))
1371 opts
->strategy
= strbuf_detach(buf
, NULL
);
1372 if (!read_oneliner(buf
, rebase_path_strategy_opts(), 0))
1375 opts
->xopts_nr
= split_cmdline(buf
->buf
, (const char ***)&opts
->xopts
);
1376 for (i
= 0; i
< opts
->xopts_nr
; i
++) {
1377 const char *arg
= opts
->xopts
[i
];
1379 skip_prefix(arg
, "--", &arg
);
1380 opts
->xopts
[i
] = xstrdup(arg
);
1384 static int read_populate_opts(struct replay_opts
*opts
)
1386 if (is_rebase_i(opts
)) {
1387 struct strbuf buf
= STRBUF_INIT
;
1389 if (read_oneliner(&buf
, rebase_path_gpg_sign_opt(), 1)) {
1390 if (!starts_with(buf
.buf
, "-S"))
1393 free(opts
->gpg_sign
);
1394 opts
->gpg_sign
= xstrdup(buf
.buf
+ 2);
1398 if (file_exists(rebase_path_verbose()))
1401 read_strategy_opts(opts
, &buf
);
1402 strbuf_release(&buf
);
1407 if (!file_exists(git_path_opts_file()))
1410 * The function git_parse_source(), called from git_config_from_file(),
1411 * may die() in case of a syntactically incorrect file. We do not care
1412 * about this case, though, because we wrote that file ourselves, so we
1413 * are pretty certain that it is syntactically correct.
1415 if (git_config_from_file(populate_opts_cb
, git_path_opts_file(), opts
) < 0)
1416 return error(_("malformed options sheet: '%s'"),
1417 git_path_opts_file());
1421 static int walk_revs_populate_todo(struct todo_list
*todo_list
,
1422 struct replay_opts
*opts
)
1424 enum todo_command command
= opts
->action
== REPLAY_PICK
?
1425 TODO_PICK
: TODO_REVERT
;
1426 const char *command_string
= todo_command_info
[command
].str
;
1427 struct commit
*commit
;
1429 if (prepare_revs(opts
))
1432 while ((commit
= get_revision(opts
->revs
))) {
1433 struct todo_item
*item
= append_new_todo(todo_list
);
1434 const char *commit_buffer
= get_commit_buffer(commit
, NULL
);
1435 const char *subject
;
1438 item
->command
= command
;
1439 item
->commit
= commit
;
1442 item
->offset_in_buf
= todo_list
->buf
.len
;
1443 subject_len
= find_commit_subject(commit_buffer
, &subject
);
1444 strbuf_addf(&todo_list
->buf
, "%s %s %.*s\n", command_string
,
1445 short_commit_name(commit
), subject_len
, subject
);
1446 unuse_commit_buffer(commit
, commit_buffer
);
1451 static int create_seq_dir(void)
1453 if (file_exists(git_path_seq_dir())) {
1454 error(_("a cherry-pick or revert is already in progress"));
1455 advise(_("try \"git cherry-pick (--continue | --quit | --abort)\""));
1457 } else if (mkdir(git_path_seq_dir(), 0777) < 0)
1458 return error_errno(_("could not create sequencer directory '%s'"),
1459 git_path_seq_dir());
1463 static int save_head(const char *head
)
1465 static struct lock_file head_lock
;
1466 struct strbuf buf
= STRBUF_INIT
;
1469 fd
= hold_lock_file_for_update(&head_lock
, git_path_head_file(), 0);
1471 rollback_lock_file(&head_lock
);
1472 return error_errno(_("could not lock HEAD"));
1474 strbuf_addf(&buf
, "%s\n", head
);
1475 if (write_in_full(fd
, buf
.buf
, buf
.len
) < 0) {
1476 rollback_lock_file(&head_lock
);
1477 return error_errno(_("could not write to '%s'"),
1478 git_path_head_file());
1480 if (commit_lock_file(&head_lock
) < 0) {
1481 rollback_lock_file(&head_lock
);
1482 return error(_("failed to finalize '%s'."), git_path_head_file());
1487 static int rollback_is_safe(void)
1489 struct strbuf sb
= STRBUF_INIT
;
1490 struct object_id expected_head
, actual_head
;
1492 if (strbuf_read_file(&sb
, git_path_abort_safety_file(), 0) >= 0) {
1494 if (get_oid_hex(sb
.buf
, &expected_head
)) {
1495 strbuf_release(&sb
);
1496 die(_("could not parse %s"), git_path_abort_safety_file());
1498 strbuf_release(&sb
);
1500 else if (errno
== ENOENT
)
1501 oidclr(&expected_head
);
1503 die_errno(_("could not read '%s'"), git_path_abort_safety_file());
1505 if (get_oid("HEAD", &actual_head
))
1506 oidclr(&actual_head
);
1508 return !oidcmp(&actual_head
, &expected_head
);
1511 static int reset_for_rollback(const unsigned char *sha1
)
1513 const char *argv
[4]; /* reset --merge <arg> + NULL */
1516 argv
[1] = "--merge";
1517 argv
[2] = sha1_to_hex(sha1
);
1519 return run_command_v_opt(argv
, RUN_GIT_CMD
);
1522 static int rollback_single_pick(void)
1524 unsigned char head_sha1
[20];
1526 if (!file_exists(git_path_cherry_pick_head()) &&
1527 !file_exists(git_path_revert_head()))
1528 return error(_("no cherry-pick or revert in progress"));
1529 if (read_ref_full("HEAD", 0, head_sha1
, NULL
))
1530 return error(_("cannot resolve HEAD"));
1531 if (is_null_sha1(head_sha1
))
1532 return error(_("cannot abort from a branch yet to be born"));
1533 return reset_for_rollback(head_sha1
);
1536 int sequencer_rollback(struct replay_opts
*opts
)
1539 unsigned char sha1
[20];
1540 struct strbuf buf
= STRBUF_INIT
;
1542 f
= fopen(git_path_head_file(), "r");
1543 if (!f
&& errno
== ENOENT
) {
1545 * There is no multiple-cherry-pick in progress.
1546 * If CHERRY_PICK_HEAD or REVERT_HEAD indicates
1547 * a single-cherry-pick in progress, abort that.
1549 return rollback_single_pick();
1552 return error_errno(_("cannot open '%s'"), git_path_head_file());
1553 if (strbuf_getline_lf(&buf
, f
)) {
1554 error(_("cannot read '%s': %s"), git_path_head_file(),
1555 ferror(f
) ? strerror(errno
) : _("unexpected end of file"));
1560 if (get_sha1_hex(buf
.buf
, sha1
) || buf
.buf
[40] != '\0') {
1561 error(_("stored pre-cherry-pick HEAD file '%s' is corrupt"),
1562 git_path_head_file());
1565 if (is_null_sha1(sha1
)) {
1566 error(_("cannot abort from a branch yet to be born"));
1570 if (!rollback_is_safe()) {
1571 /* Do not error, just do not rollback */
1572 warning(_("You seem to have moved HEAD. "
1573 "Not rewinding, check your HEAD!"));
1575 if (reset_for_rollback(sha1
))
1577 strbuf_release(&buf
);
1578 return sequencer_remove_state(opts
);
1580 strbuf_release(&buf
);
1584 static int save_todo(struct todo_list
*todo_list
, struct replay_opts
*opts
)
1586 static struct lock_file todo_lock
;
1587 const char *todo_path
= get_todo_path(opts
);
1588 int next
= todo_list
->current
, offset
, fd
;
1591 * rebase -i writes "git-rebase-todo" without the currently executing
1592 * command, appending it to "done" instead.
1594 if (is_rebase_i(opts
))
1597 fd
= hold_lock_file_for_update(&todo_lock
, todo_path
, 0);
1599 return error_errno(_("could not lock '%s'"), todo_path
);
1600 offset
= next
< todo_list
->nr
?
1601 todo_list
->items
[next
].offset_in_buf
: todo_list
->buf
.len
;
1602 if (write_in_full(fd
, todo_list
->buf
.buf
+ offset
,
1603 todo_list
->buf
.len
- offset
) < 0)
1604 return error_errno(_("could not write to '%s'"), todo_path
);
1605 if (commit_lock_file(&todo_lock
) < 0)
1606 return error(_("failed to finalize '%s'."), todo_path
);
1608 if (is_rebase_i(opts
)) {
1609 const char *done_path
= rebase_path_done();
1610 int fd
= open(done_path
, O_CREAT
| O_WRONLY
| O_APPEND
, 0666);
1611 int prev_offset
= !next
? 0 :
1612 todo_list
->items
[next
- 1].offset_in_buf
;
1614 if (fd
>= 0 && offset
> prev_offset
&&
1615 write_in_full(fd
, todo_list
->buf
.buf
+ prev_offset
,
1616 offset
- prev_offset
) < 0) {
1618 return error_errno(_("could not write to '%s'"),
1627 static int save_opts(struct replay_opts
*opts
)
1629 const char *opts_file
= git_path_opts_file();
1632 if (opts
->no_commit
)
1633 res
|= git_config_set_in_file_gently(opts_file
, "options.no-commit", "true");
1635 res
|= git_config_set_in_file_gently(opts_file
, "options.edit", "true");
1637 res
|= git_config_set_in_file_gently(opts_file
, "options.signoff", "true");
1638 if (opts
->record_origin
)
1639 res
|= git_config_set_in_file_gently(opts_file
, "options.record-origin", "true");
1641 res
|= git_config_set_in_file_gently(opts_file
, "options.allow-ff", "true");
1642 if (opts
->mainline
) {
1643 struct strbuf buf
= STRBUF_INIT
;
1644 strbuf_addf(&buf
, "%d", opts
->mainline
);
1645 res
|= git_config_set_in_file_gently(opts_file
, "options.mainline", buf
.buf
);
1646 strbuf_release(&buf
);
1649 res
|= git_config_set_in_file_gently(opts_file
, "options.strategy", opts
->strategy
);
1651 res
|= git_config_set_in_file_gently(opts_file
, "options.gpg-sign", opts
->gpg_sign
);
1654 for (i
= 0; i
< opts
->xopts_nr
; i
++)
1655 res
|= git_config_set_multivar_in_file_gently(opts_file
,
1656 "options.strategy-option",
1657 opts
->xopts
[i
], "^$", 0);
1662 static int make_patch(struct commit
*commit
, struct replay_opts
*opts
)
1664 struct strbuf buf
= STRBUF_INIT
;
1665 struct rev_info log_tree_opt
;
1666 const char *subject
, *p
;
1669 p
= short_commit_name(commit
);
1670 if (write_message(p
, strlen(p
), rebase_path_stopped_sha(), 1) < 0)
1673 strbuf_addf(&buf
, "%s/patch", get_dir(opts
));
1674 memset(&log_tree_opt
, 0, sizeof(log_tree_opt
));
1675 init_revisions(&log_tree_opt
, NULL
);
1676 log_tree_opt
.abbrev
= 0;
1677 log_tree_opt
.diff
= 1;
1678 log_tree_opt
.diffopt
.output_format
= DIFF_FORMAT_PATCH
;
1679 log_tree_opt
.disable_stdin
= 1;
1680 log_tree_opt
.no_commit_id
= 1;
1681 log_tree_opt
.diffopt
.file
= fopen(buf
.buf
, "w");
1682 log_tree_opt
.diffopt
.use_color
= GIT_COLOR_NEVER
;
1683 if (!log_tree_opt
.diffopt
.file
)
1684 res
|= error_errno(_("could not open '%s'"), buf
.buf
);
1686 res
|= log_tree_commit(&log_tree_opt
, commit
);
1687 fclose(log_tree_opt
.diffopt
.file
);
1691 strbuf_addf(&buf
, "%s/message", get_dir(opts
));
1692 if (!file_exists(buf
.buf
)) {
1693 const char *commit_buffer
= get_commit_buffer(commit
, NULL
);
1694 find_commit_subject(commit_buffer
, &subject
);
1695 res
|= write_message(subject
, strlen(subject
), buf
.buf
, 1);
1696 unuse_commit_buffer(commit
, commit_buffer
);
1698 strbuf_release(&buf
);
1703 static int intend_to_amend(void)
1705 unsigned char head
[20];
1708 if (get_sha1("HEAD", head
))
1709 return error(_("cannot read HEAD"));
1711 p
= sha1_to_hex(head
);
1712 return write_message(p
, strlen(p
), rebase_path_amend(), 1);
1715 static int error_with_patch(struct commit
*commit
,
1716 const char *subject
, int subject_len
,
1717 struct replay_opts
*opts
, int exit_code
, int to_amend
)
1719 if (make_patch(commit
, opts
))
1723 if (intend_to_amend())
1726 fprintf(stderr
, "You can amend the commit now, with\n"
1728 " git commit --amend %s\n"
1730 "Once you are satisfied with your changes, run\n"
1732 " git rebase --continue\n", gpg_sign_opt_quoted(opts
));
1733 } else if (exit_code
)
1734 fprintf(stderr
, "Could not apply %s... %.*s\n",
1735 short_commit_name(commit
), subject_len
, subject
);
1740 static int error_failed_squash(struct commit
*commit
,
1741 struct replay_opts
*opts
, int subject_len
, const char *subject
)
1743 if (rename(rebase_path_squash_msg(), rebase_path_message()))
1744 return error(_("could not rename '%s' to '%s'"),
1745 rebase_path_squash_msg(), rebase_path_message());
1746 unlink(rebase_path_fixup_msg());
1747 unlink(git_path("MERGE_MSG"));
1748 if (copy_file(git_path("MERGE_MSG"), rebase_path_message(), 0666))
1749 return error(_("could not copy '%s' to '%s'"),
1750 rebase_path_message(), git_path("MERGE_MSG"));
1751 return error_with_patch(commit
, subject
, subject_len
, opts
, 1, 0);
1754 static int do_exec(const char *command_line
)
1756 const char *child_argv
[] = { NULL
, NULL
};
1759 fprintf(stderr
, "Executing: %s\n", command_line
);
1760 child_argv
[0] = command_line
;
1761 status
= run_command_v_opt(child_argv
, RUN_USING_SHELL
);
1763 /* force re-reading of the cache */
1764 if (discard_cache() < 0 || read_cache() < 0)
1765 return error(_("could not read index"));
1767 dirty
= require_clean_work_tree("rebase", NULL
, 1, 1);
1770 warning(_("execution failed: %s\n%s"
1771 "You can fix the problem, and then run\n"
1773 " git rebase --continue\n"
1776 dirty
? N_("and made changes to the index and/or the "
1777 "working tree\n") : "");
1779 /* command not found */
1782 warning(_("execution succeeded: %s\nbut "
1783 "left changes to the index and/or the working tree\n"
1784 "Commit or stash your changes, and then run\n"
1786 " git rebase --continue\n"
1787 "\n"), command_line
);
1794 static int is_final_fixup(struct todo_list
*todo_list
)
1796 int i
= todo_list
->current
;
1798 if (!is_fixup(todo_list
->items
[i
].command
))
1801 while (++i
< todo_list
->nr
)
1802 if (is_fixup(todo_list
->items
[i
].command
))
1804 else if (!is_noop(todo_list
->items
[i
].command
))
1809 static enum todo_command
peek_command(struct todo_list
*todo_list
, int offset
)
1813 for (i
= todo_list
->current
+ offset
; i
< todo_list
->nr
; i
++)
1814 if (!is_noop(todo_list
->items
[i
].command
))
1815 return todo_list
->items
[i
].command
;
1820 static int apply_autostash(struct replay_opts
*opts
)
1822 struct strbuf stash_sha1
= STRBUF_INIT
;
1823 struct child_process child
= CHILD_PROCESS_INIT
;
1826 if (!read_oneliner(&stash_sha1
, rebase_path_autostash(), 1)) {
1827 strbuf_release(&stash_sha1
);
1830 strbuf_trim(&stash_sha1
);
1833 argv_array_push(&child
.args
, "stash");
1834 argv_array_push(&child
.args
, "apply");
1835 argv_array_push(&child
.args
, stash_sha1
.buf
);
1836 if (!run_command(&child
))
1837 printf(_("Applied autostash."));
1839 struct child_process store
= CHILD_PROCESS_INIT
;
1842 argv_array_push(&store
.args
, "stash");
1843 argv_array_push(&store
.args
, "store");
1844 argv_array_push(&store
.args
, "-m");
1845 argv_array_push(&store
.args
, "autostash");
1846 argv_array_push(&store
.args
, "-q");
1847 argv_array_push(&store
.args
, stash_sha1
.buf
);
1848 if (run_command(&store
))
1849 ret
= error(_("cannot store %s"), stash_sha1
.buf
);
1851 printf(_("Applying autostash resulted in conflicts.\n"
1852 "Your changes are safe in the stash.\n"
1853 "You can run \"git stash pop\" or"
1854 " \"git stash drop\" at any time.\n"));
1857 strbuf_release(&stash_sha1
);
1861 static const char *reflog_message(struct replay_opts
*opts
,
1862 const char *sub_action
, const char *fmt
, ...)
1865 static struct strbuf buf
= STRBUF_INIT
;
1869 strbuf_addstr(&buf
, action_name(opts
));
1871 strbuf_addf(&buf
, " (%s)", sub_action
);
1873 strbuf_addstr(&buf
, ": ");
1874 strbuf_vaddf(&buf
, fmt
, ap
);
1881 static int pick_commits(struct todo_list
*todo_list
, struct replay_opts
*opts
)
1885 setenv(GIT_REFLOG_ACTION
, action_name(opts
), 0);
1887 assert(!(opts
->signoff
|| opts
->no_commit
||
1888 opts
->record_origin
|| opts
->edit
));
1889 if (read_and_refresh_cache(opts
))
1892 while (todo_list
->current
< todo_list
->nr
) {
1893 struct todo_item
*item
= todo_list
->items
+ todo_list
->current
;
1894 if (save_todo(todo_list
, opts
))
1896 if (is_rebase_i(opts
)) {
1897 unlink(rebase_path_message());
1898 unlink(rebase_path_author_script());
1899 unlink(rebase_path_stopped_sha());
1900 unlink(rebase_path_amend());
1902 if (item
->command
<= TODO_SQUASH
) {
1903 if (is_rebase_i(opts
))
1904 setenv("GIT_REFLOG_ACTION", reflog_message(opts
,
1905 command_to_string(item
->command
), NULL
),
1907 res
= do_pick_commit(item
->command
, item
->commit
,
1908 opts
, is_final_fixup(todo_list
));
1909 if (is_rebase_i(opts
) && res
< 0) {
1911 todo_list
->current
--;
1912 if (save_todo(todo_list
, opts
))
1915 if (item
->command
== TODO_EDIT
) {
1916 struct commit
*commit
= item
->commit
;
1918 warning(_("stopped at %s... %.*s"),
1919 short_commit_name(commit
),
1920 item
->arg_len
, item
->arg
);
1921 return error_with_patch(commit
,
1922 item
->arg
, item
->arg_len
, opts
, res
,
1925 if (is_rebase_i(opts
) && !res
)
1926 record_in_rewritten(&item
->commit
->object
.oid
,
1927 peek_command(todo_list
, 1));
1928 if (res
&& is_fixup(item
->command
)) {
1931 return error_failed_squash(item
->commit
, opts
,
1932 item
->arg_len
, item
->arg
);
1933 } else if (res
&& is_rebase_i(opts
))
1934 return res
| error_with_patch(item
->commit
,
1935 item
->arg
, item
->arg_len
, opts
, res
,
1936 item
->command
== TODO_REWORD
);
1937 } else if (item
->command
== TODO_EXEC
) {
1938 char *end_of_arg
= (char *)(item
->arg
+ item
->arg_len
);
1939 int saved
= *end_of_arg
;
1942 res
= do_exec(item
->arg
);
1943 *end_of_arg
= saved
;
1944 } else if (!is_noop(item
->command
))
1945 return error(_("unknown command %d"), item
->command
);
1947 todo_list
->current
++;
1952 if (is_rebase_i(opts
)) {
1953 struct strbuf head_ref
= STRBUF_INIT
, buf
= STRBUF_INIT
;
1956 /* Stopped in the middle, as planned? */
1957 if (todo_list
->current
< todo_list
->nr
)
1960 if (read_oneliner(&head_ref
, rebase_path_head_name(), 0) &&
1961 starts_with(head_ref
.buf
, "refs/")) {
1963 unsigned char head
[20], orig
[20];
1966 if (get_sha1("HEAD", head
)) {
1967 res
= error(_("cannot read HEAD"));
1969 strbuf_release(&head_ref
);
1970 strbuf_release(&buf
);
1973 if (!read_oneliner(&buf
, rebase_path_orig_head(), 0) ||
1974 get_sha1_hex(buf
.buf
, orig
)) {
1975 res
= error(_("could not read orig-head"));
1976 goto cleanup_head_ref
;
1978 if (!read_oneliner(&buf
, rebase_path_onto(), 0)) {
1979 res
= error(_("could not read 'onto'"));
1980 goto cleanup_head_ref
;
1982 msg
= reflog_message(opts
, "finish", "%s onto %s",
1983 head_ref
.buf
, buf
.buf
);
1984 if (update_ref(msg
, head_ref
.buf
, head
, orig
,
1985 REF_NODEREF
, UPDATE_REFS_MSG_ON_ERR
)) {
1986 res
= error(_("could not update %s"),
1988 goto cleanup_head_ref
;
1990 msg
= reflog_message(opts
, "finish", "returning to %s",
1992 if (create_symref("HEAD", head_ref
.buf
, msg
)) {
1993 res
= error(_("could not update HEAD to %s"),
1995 goto cleanup_head_ref
;
2000 if (opts
->verbose
) {
2001 struct rev_info log_tree_opt
;
2002 struct object_id orig
, head
;
2004 memset(&log_tree_opt
, 0, sizeof(log_tree_opt
));
2005 init_revisions(&log_tree_opt
, NULL
);
2006 log_tree_opt
.diff
= 1;
2007 log_tree_opt
.diffopt
.output_format
=
2008 DIFF_FORMAT_DIFFSTAT
;
2009 log_tree_opt
.disable_stdin
= 1;
2011 if (read_oneliner(&buf
, rebase_path_orig_head(), 0) &&
2012 !get_sha1(buf
.buf
, orig
.hash
) &&
2013 !get_sha1("HEAD", head
.hash
)) {
2014 diff_tree_sha1(orig
.hash
, head
.hash
,
2015 "", &log_tree_opt
.diffopt
);
2016 log_tree_diff_flush(&log_tree_opt
);
2019 flush_rewritten_pending();
2020 if (!stat(rebase_path_rewritten_list(), &st
) &&
2022 struct child_process child
= CHILD_PROCESS_INIT
;
2023 const char *post_rewrite_hook
=
2024 find_hook("post-rewrite");
2026 child
.in
= open(rebase_path_rewritten_list(), O_RDONLY
);
2028 argv_array_push(&child
.args
, "notes");
2029 argv_array_push(&child
.args
, "copy");
2030 argv_array_push(&child
.args
, "--for-rewrite=rebase");
2031 /* we don't care if this copying failed */
2032 run_command(&child
);
2034 if (post_rewrite_hook
) {
2035 struct child_process hook
= CHILD_PROCESS_INIT
;
2037 hook
.in
= open(rebase_path_rewritten_list(),
2039 hook
.stdout_to_stderr
= 1;
2040 argv_array_push(&hook
.args
, post_rewrite_hook
);
2041 argv_array_push(&hook
.args
, "rebase");
2042 /* we don't care if this hook failed */
2046 apply_autostash(opts
);
2048 strbuf_release(&buf
);
2049 strbuf_release(&head_ref
);
2053 * Sequence of picks finished successfully; cleanup by
2054 * removing the .git/sequencer directory
2056 return sequencer_remove_state(opts
);
2059 static int continue_single_pick(void)
2061 const char *argv
[] = { "commit", NULL
};
2063 if (!file_exists(git_path_cherry_pick_head()) &&
2064 !file_exists(git_path_revert_head()))
2065 return error(_("no cherry-pick or revert in progress"));
2066 return run_command_v_opt(argv
, RUN_GIT_CMD
);
2069 static int commit_staged_changes(struct replay_opts
*opts
)
2073 if (has_unstaged_changes(1))
2074 return error(_("cannot rebase: You have unstaged changes."));
2075 if (!has_uncommitted_changes(0)) {
2076 const char *cherry_pick_head
= git_path("CHERRY_PICK_HEAD");
2078 if (file_exists(cherry_pick_head
) && unlink(cherry_pick_head
))
2079 return error(_("could not remove CHERRY_PICK_HEAD"));
2083 if (file_exists(rebase_path_amend())) {
2084 struct strbuf rev
= STRBUF_INIT
;
2085 unsigned char head
[20], to_amend
[20];
2087 if (get_sha1("HEAD", head
))
2088 return error(_("cannot amend non-existing commit"));
2089 if (!read_oneliner(&rev
, rebase_path_amend(), 0))
2090 return error(_("invalid file: '%s'"), rebase_path_amend());
2091 if (get_sha1_hex(rev
.buf
, to_amend
))
2092 return error(_("invalid contents: '%s'"),
2093 rebase_path_amend());
2094 if (hashcmp(head
, to_amend
))
2095 return error(_("\nYou have uncommitted changes in your "
2096 "working tree. Please, commit them\n"
2097 "first and then run 'git rebase "
2098 "--continue' again."));
2100 strbuf_release(&rev
);
2104 if (run_git_commit(rebase_path_message(), opts
, 1, 1, amend
, 0))
2105 return error(_("could not commit staged changes."));
2106 unlink(rebase_path_amend());
2110 int sequencer_continue(struct replay_opts
*opts
)
2112 struct todo_list todo_list
= TODO_LIST_INIT
;
2115 if (read_and_refresh_cache(opts
))
2118 if (is_rebase_i(opts
)) {
2119 if (commit_staged_changes(opts
))
2121 } else if (!file_exists(get_todo_path(opts
)))
2122 return continue_single_pick();
2123 if (read_populate_opts(opts
))
2125 if ((res
= read_populate_todo(&todo_list
, opts
)))
2126 goto release_todo_list
;
2128 if (!is_rebase_i(opts
)) {
2129 /* Verify that the conflict has been resolved */
2130 if (file_exists(git_path_cherry_pick_head()) ||
2131 file_exists(git_path_revert_head())) {
2132 res
= continue_single_pick();
2134 goto release_todo_list
;
2136 if (index_differs_from("HEAD", 0, 0)) {
2137 res
= error_dirty_index(opts
);
2138 goto release_todo_list
;
2140 todo_list
.current
++;
2141 } else if (file_exists(rebase_path_stopped_sha())) {
2142 struct strbuf buf
= STRBUF_INIT
;
2143 struct object_id oid
;
2145 if (read_oneliner(&buf
, rebase_path_stopped_sha(), 1) &&
2146 !get_sha1_committish(buf
.buf
, oid
.hash
))
2147 record_in_rewritten(&oid
, peek_command(&todo_list
, 0));
2148 strbuf_release(&buf
);
2151 res
= pick_commits(&todo_list
, opts
);
2153 todo_list_release(&todo_list
);
2157 static int single_pick(struct commit
*cmit
, struct replay_opts
*opts
)
2159 setenv(GIT_REFLOG_ACTION
, action_name(opts
), 0);
2160 return do_pick_commit(opts
->action
== REPLAY_PICK
?
2161 TODO_PICK
: TODO_REVERT
, cmit
, opts
, 0);
2164 int sequencer_pick_revisions(struct replay_opts
*opts
)
2166 struct todo_list todo_list
= TODO_LIST_INIT
;
2167 unsigned char sha1
[20];
2171 if (read_and_refresh_cache(opts
))
2174 for (i
= 0; i
< opts
->revs
->pending
.nr
; i
++) {
2175 unsigned char sha1
[20];
2176 const char *name
= opts
->revs
->pending
.objects
[i
].name
;
2178 /* This happens when using --stdin. */
2182 if (!get_sha1(name
, sha1
)) {
2183 if (!lookup_commit_reference_gently(sha1
, 1)) {
2184 enum object_type type
= sha1_object_info(sha1
, NULL
);
2185 return error(_("%s: can't cherry-pick a %s"),
2186 name
, typename(type
));
2189 return error(_("%s: bad revision"), name
);
2193 * If we were called as "git cherry-pick <commit>", just
2194 * cherry-pick/revert it, set CHERRY_PICK_HEAD /
2195 * REVERT_HEAD, and don't touch the sequencer state.
2196 * This means it is possible to cherry-pick in the middle
2197 * of a cherry-pick sequence.
2199 if (opts
->revs
->cmdline
.nr
== 1 &&
2200 opts
->revs
->cmdline
.rev
->whence
== REV_CMD_REV
&&
2201 opts
->revs
->no_walk
&&
2202 !opts
->revs
->cmdline
.rev
->flags
) {
2203 struct commit
*cmit
;
2204 if (prepare_revision_walk(opts
->revs
))
2205 return error(_("revision walk setup failed"));
2206 cmit
= get_revision(opts
->revs
);
2207 if (!cmit
|| get_revision(opts
->revs
))
2208 return error("BUG: expected exactly one commit from walk");
2209 return single_pick(cmit
, opts
);
2213 * Start a new cherry-pick/ revert sequence; but
2214 * first, make sure that an existing one isn't in
2218 if (walk_revs_populate_todo(&todo_list
, opts
) ||
2219 create_seq_dir() < 0)
2221 if (get_sha1("HEAD", sha1
) && (opts
->action
== REPLAY_REVERT
))
2222 return error(_("can't revert as initial commit"));
2223 if (save_head(sha1_to_hex(sha1
)))
2225 if (save_opts(opts
))
2227 update_abort_safety_file();
2228 res
= pick_commits(&todo_list
, opts
);
2229 todo_list_release(&todo_list
);
2233 void append_signoff(struct strbuf
*msgbuf
, int ignore_footer
, unsigned flag
)
2235 unsigned no_dup_sob
= flag
& APPEND_SIGNOFF_DEDUP
;
2236 struct strbuf sob
= STRBUF_INIT
;
2239 strbuf_addstr(&sob
, sign_off_header
);
2240 strbuf_addstr(&sob
, fmt_name(getenv("GIT_COMMITTER_NAME"),
2241 getenv("GIT_COMMITTER_EMAIL")));
2242 strbuf_addch(&sob
, '\n');
2245 * If the whole message buffer is equal to the sob, pretend that we
2246 * found a conforming footer with a matching sob
2248 if (msgbuf
->len
- ignore_footer
== sob
.len
&&
2249 !strncmp(msgbuf
->buf
, sob
.buf
, sob
.len
))
2252 has_footer
= has_conforming_footer(msgbuf
, &sob
, ignore_footer
);
2255 const char *append_newlines
= NULL
;
2256 size_t len
= msgbuf
->len
- ignore_footer
;
2260 * The buffer is completely empty. Leave foom for
2261 * the title and body to be filled in by the user.
2263 append_newlines
= "\n\n";
2264 } else if (msgbuf
->buf
[len
- 1] != '\n') {
2266 * Incomplete line. Complete the line and add a
2267 * blank one so that there is an empty line between
2268 * the message body and the sob.
2270 append_newlines
= "\n\n";
2271 } else if (len
== 1) {
2273 * Buffer contains a single newline. Add another
2274 * so that we leave room for the title and body.
2276 append_newlines
= "\n";
2277 } else if (msgbuf
->buf
[len
- 2] != '\n') {
2279 * Buffer ends with a single newline. Add another
2280 * so that there is an empty line between the message
2283 append_newlines
= "\n";
2284 } /* else, the buffer already ends with two newlines. */
2286 if (append_newlines
)
2287 strbuf_splice(msgbuf
, msgbuf
->len
- ignore_footer
, 0,
2288 append_newlines
, strlen(append_newlines
));
2291 if (has_footer
!= 3 && (!no_dup_sob
|| has_footer
!= 2))
2292 strbuf_splice(msgbuf
, msgbuf
->len
- ignore_footer
, 0,
2295 strbuf_release(&sob
);