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 * The following files are written by git-rebase just after parsing the
100 * command-line (and are only consumed, not modified, by the sequencer).
102 static GIT_PATH_FUNC(rebase_path_gpg_sign_opt
, "rebase-merge/gpg_sign_opt")
103 static GIT_PATH_FUNC(rebase_path_orig_head
, "rebase-merge/orig-head")
104 static GIT_PATH_FUNC(rebase_path_verbose
, "rebase-merge/verbose")
106 static inline int is_rebase_i(const struct replay_opts
*opts
)
108 return opts
->action
== REPLAY_INTERACTIVE_REBASE
;
111 static const char *get_dir(const struct replay_opts
*opts
)
113 if (is_rebase_i(opts
))
114 return rebase_path();
115 return git_path_seq_dir();
118 static const char *get_todo_path(const struct replay_opts
*opts
)
120 if (is_rebase_i(opts
))
121 return rebase_path_todo();
122 return git_path_todo_file();
126 * Returns 0 for non-conforming footer
127 * Returns 1 for conforming footer
128 * Returns 2 when sob exists within conforming footer
129 * Returns 3 when sob exists within conforming footer as last entry
131 static int has_conforming_footer(struct strbuf
*sb
, struct strbuf
*sob
,
134 struct trailer_info info
;
136 int found_sob
= 0, found_sob_last
= 0;
138 trailer_info_get(&info
, sb
->buf
);
140 if (info
.trailer_start
== info
.trailer_end
)
143 for (i
= 0; i
< info
.trailer_nr
; i
++)
144 if (sob
&& !strncmp(info
.trailers
[i
], sob
->buf
, sob
->len
)) {
146 if (i
== info
.trailer_nr
- 1)
150 trailer_info_release(&info
);
159 static const char *gpg_sign_opt_quoted(struct replay_opts
*opts
)
161 static struct strbuf buf
= STRBUF_INIT
;
165 sq_quotef(&buf
, "-S%s", opts
->gpg_sign
);
169 int sequencer_remove_state(struct replay_opts
*opts
)
171 struct strbuf dir
= STRBUF_INIT
;
174 free(opts
->gpg_sign
);
175 free(opts
->strategy
);
176 for (i
= 0; i
< opts
->xopts_nr
; i
++)
177 free(opts
->xopts
[i
]);
180 strbuf_addf(&dir
, "%s", get_dir(opts
));
181 remove_dir_recursively(&dir
, 0);
182 strbuf_release(&dir
);
187 static const char *action_name(const struct replay_opts
*opts
)
189 switch (opts
->action
) {
193 return N_("cherry-pick");
194 case REPLAY_INTERACTIVE_REBASE
:
195 return N_("rebase -i");
197 die(_("Unknown action: %d"), opts
->action
);
200 struct commit_message
{
207 static const char *short_commit_name(struct commit
*commit
)
209 return find_unique_abbrev(commit
->object
.oid
.hash
, DEFAULT_ABBREV
);
212 static int get_message(struct commit
*commit
, struct commit_message
*out
)
214 const char *abbrev
, *subject
;
217 out
->message
= logmsg_reencode(commit
, NULL
, get_commit_output_encoding());
218 abbrev
= short_commit_name(commit
);
220 subject_len
= find_commit_subject(out
->message
, &subject
);
222 out
->subject
= xmemdupz(subject
, subject_len
);
223 out
->label
= xstrfmt("%s... %s", abbrev
, out
->subject
);
224 out
->parent_label
= xstrfmt("parent of %s", out
->label
);
229 static void free_message(struct commit
*commit
, struct commit_message
*msg
)
231 free(msg
->parent_label
);
234 unuse_commit_buffer(commit
, msg
->message
);
237 static void print_advice(int show_hint
, struct replay_opts
*opts
)
239 char *msg
= getenv("GIT_CHERRY_PICK_HELP");
242 fprintf(stderr
, "%s\n", msg
);
244 * A conflict has occurred but the porcelain
245 * (typically rebase --interactive) wants to take care
246 * of the commit itself so remove CHERRY_PICK_HEAD
248 unlink(git_path_cherry_pick_head());
254 advise(_("after resolving the conflicts, mark the corrected paths\n"
255 "with 'git add <paths>' or 'git rm <paths>'"));
257 advise(_("after resolving the conflicts, mark the corrected paths\n"
258 "with 'git add <paths>' or 'git rm <paths>'\n"
259 "and commit the result with 'git commit'"));
263 static int write_message(const void *buf
, size_t len
, const char *filename
,
266 static struct lock_file msg_file
;
268 int msg_fd
= hold_lock_file_for_update(&msg_file
, filename
, 0);
270 return error_errno(_("could not lock '%s'"), filename
);
271 if (write_in_full(msg_fd
, buf
, len
) < 0) {
272 rollback_lock_file(&msg_file
);
273 return error_errno(_("could not write to '%s'"), filename
);
275 if (append_eol
&& write(msg_fd
, "\n", 1) < 0) {
276 rollback_lock_file(&msg_file
);
277 return error_errno(_("could not write eol to '%s'"), filename
);
279 if (commit_lock_file(&msg_file
) < 0) {
280 rollback_lock_file(&msg_file
);
281 return error(_("failed to finalize '%s'."), filename
);
288 * Reads a file that was presumably written by a shell script, i.e. with an
289 * end-of-line marker that needs to be stripped.
291 * Note that only the last end-of-line marker is stripped, consistent with the
292 * behavior of "$(cat path)" in a shell script.
294 * Returns 1 if the file was read, 0 if it could not be read or does not exist.
296 static int read_oneliner(struct strbuf
*buf
,
297 const char *path
, int skip_if_empty
)
299 int orig_len
= buf
->len
;
301 if (!file_exists(path
))
304 if (strbuf_read_file(buf
, path
, 0) < 0) {
305 warning_errno(_("could not read '%s'"), path
);
309 if (buf
->len
> orig_len
&& buf
->buf
[buf
->len
- 1] == '\n') {
310 if (--buf
->len
> orig_len
&& buf
->buf
[buf
->len
- 1] == '\r')
312 buf
->buf
[buf
->len
] = '\0';
315 if (skip_if_empty
&& buf
->len
== orig_len
)
321 static struct tree
*empty_tree(void)
323 return lookup_tree(EMPTY_TREE_SHA1_BIN
);
326 static int error_dirty_index(struct replay_opts
*opts
)
328 if (read_cache_unmerged())
329 return error_resolve_conflict(_(action_name(opts
)));
331 error(_("your local changes would be overwritten by %s."),
332 _(action_name(opts
)));
334 if (advice_commit_before_merge
)
335 advise(_("commit your changes or stash them to proceed."));
339 static void update_abort_safety_file(void)
341 struct object_id head
;
343 /* Do nothing on a single-pick */
344 if (!file_exists(git_path_seq_dir()))
347 if (!get_oid("HEAD", &head
))
348 write_file(git_path_abort_safety_file(), "%s", oid_to_hex(&head
));
350 write_file(git_path_abort_safety_file(), "%s", "");
353 static int fast_forward_to(const unsigned char *to
, const unsigned char *from
,
354 int unborn
, struct replay_opts
*opts
)
356 struct ref_transaction
*transaction
;
357 struct strbuf sb
= STRBUF_INIT
;
358 struct strbuf err
= STRBUF_INIT
;
361 if (checkout_fast_forward(from
, to
, 1))
362 return -1; /* the callee should have complained already */
364 strbuf_addf(&sb
, _("%s: fast-forward"), _(action_name(opts
)));
366 transaction
= ref_transaction_begin(&err
);
368 ref_transaction_update(transaction
, "HEAD",
369 to
, unborn
? null_sha1
: from
,
371 ref_transaction_commit(transaction
, &err
)) {
372 ref_transaction_free(transaction
);
373 error("%s", err
.buf
);
375 strbuf_release(&err
);
380 strbuf_release(&err
);
381 ref_transaction_free(transaction
);
382 update_abort_safety_file();
386 void append_conflicts_hint(struct strbuf
*msgbuf
)
390 strbuf_addch(msgbuf
, '\n');
391 strbuf_commented_addf(msgbuf
, "Conflicts:\n");
392 for (i
= 0; i
< active_nr
;) {
393 const struct cache_entry
*ce
= active_cache
[i
++];
395 strbuf_commented_addf(msgbuf
, "\t%s\n", ce
->name
);
396 while (i
< active_nr
&& !strcmp(ce
->name
,
397 active_cache
[i
]->name
))
403 static int do_recursive_merge(struct commit
*base
, struct commit
*next
,
404 const char *base_label
, const char *next_label
,
405 unsigned char *head
, struct strbuf
*msgbuf
,
406 struct replay_opts
*opts
)
408 struct merge_options o
;
409 struct tree
*result
, *next_tree
, *base_tree
, *head_tree
;
412 static struct lock_file index_lock
;
414 hold_locked_index(&index_lock
, LOCK_DIE_ON_ERROR
);
418 init_merge_options(&o
);
419 o
.ancestor
= base
? base_label
: "(empty tree)";
421 o
.branch2
= next
? next_label
: "(empty tree)";
423 head_tree
= parse_tree_indirect(head
);
424 next_tree
= next
? next
->tree
: empty_tree();
425 base_tree
= base
? base
->tree
: empty_tree();
427 for (xopt
= opts
->xopts
; xopt
!= opts
->xopts
+ opts
->xopts_nr
; xopt
++)
428 parse_merge_opt(&o
, *xopt
);
430 clean
= merge_trees(&o
,
432 next_tree
, base_tree
, &result
);
433 strbuf_release(&o
.obuf
);
437 if (active_cache_changed
&&
438 write_locked_index(&the_index
, &index_lock
, COMMIT_LOCK
))
439 /* TRANSLATORS: %s will be "revert", "cherry-pick" or
442 return error(_("%s: Unable to write new index file"),
443 _(action_name(opts
)));
444 rollback_lock_file(&index_lock
);
447 append_signoff(msgbuf
, 0, 0);
450 append_conflicts_hint(msgbuf
);
455 static int is_index_unchanged(void)
457 unsigned char head_sha1
[20];
458 struct commit
*head_commit
;
460 if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING
, head_sha1
, NULL
))
461 return error(_("could not resolve HEAD commit\n"));
463 head_commit
= lookup_commit(head_sha1
);
466 * If head_commit is NULL, check_commit, called from
467 * lookup_commit, would have indicated that head_commit is not
468 * a commit object already. parse_commit() will return failure
469 * without further complaints in such a case. Otherwise, if
470 * the commit is invalid, parse_commit() will complain. So
471 * there is nothing for us to say here. Just return failure.
473 if (parse_commit(head_commit
))
476 if (!active_cache_tree
)
477 active_cache_tree
= cache_tree();
479 if (!cache_tree_fully_valid(active_cache_tree
))
480 if (cache_tree_update(&the_index
, 0))
481 return error(_("unable to update cache tree\n"));
483 return !hashcmp(active_cache_tree
->sha1
, head_commit
->tree
->object
.oid
.hash
);
486 static int write_author_script(const char *message
)
488 struct strbuf buf
= STRBUF_INIT
;
493 if (!*message
|| starts_with(message
, "\n")) {
495 /* Missing 'author' line? */
496 unlink(rebase_path_author_script());
498 } else if (skip_prefix(message
, "author ", &message
))
500 else if ((eol
= strchr(message
, '\n')))
505 strbuf_addstr(&buf
, "GIT_AUTHOR_NAME='");
506 while (*message
&& *message
!= '\n' && *message
!= '\r')
507 if (skip_prefix(message
, " <", &message
))
509 else if (*message
!= '\'')
510 strbuf_addch(&buf
, *(message
++));
512 strbuf_addf(&buf
, "'\\\\%c'", *(message
++));
513 strbuf_addstr(&buf
, "'\nGIT_AUTHOR_EMAIL='");
514 while (*message
&& *message
!= '\n' && *message
!= '\r')
515 if (skip_prefix(message
, "> ", &message
))
517 else if (*message
!= '\'')
518 strbuf_addch(&buf
, *(message
++));
520 strbuf_addf(&buf
, "'\\\\%c'", *(message
++));
521 strbuf_addstr(&buf
, "'\nGIT_AUTHOR_DATE='@");
522 while (*message
&& *message
!= '\n' && *message
!= '\r')
523 if (*message
!= '\'')
524 strbuf_addch(&buf
, *(message
++));
526 strbuf_addf(&buf
, "'\\\\%c'", *(message
++));
527 res
= write_message(buf
.buf
, buf
.len
, rebase_path_author_script(), 1);
528 strbuf_release(&buf
);
533 * Read the author-script file into an environment block, ready for use in
534 * run_command(), that can be free()d afterwards.
536 static char **read_author_script(void)
538 struct strbuf script
= STRBUF_INIT
;
543 if (strbuf_read_file(&script
, rebase_path_author_script(), 256) <= 0)
546 for (p
= script
.buf
; *p
; p
++)
547 if (skip_prefix(p
, "'\\\\''", (const char **)&p2
))
548 strbuf_splice(&script
, p
- script
.buf
, p2
- p
, "'", 1);
550 strbuf_splice(&script
, p
-- - script
.buf
, 1, "", 0);
551 else if (*p
== '\n') {
556 env_size
= (count
+ 1) * sizeof(*env
);
557 strbuf_grow(&script
, env_size
);
558 memmove(script
.buf
+ env_size
, script
.buf
, script
.len
);
559 p
= script
.buf
+ env_size
;
560 env
= (char **)strbuf_detach(&script
, NULL
);
562 for (i
= 0; i
< count
; i
++) {
571 static const char staged_changes_advice
[] =
572 N_("you have staged changes in your working tree\n"
573 "If these changes are meant to be squashed into the previous commit, run:\n"
575 " git commit --amend %s\n"
577 "If they are meant to go into a new commit, run:\n"
581 "In both cases, once you're done, continue with:\n"
583 " git rebase --continue\n");
586 * If we are cherry-pick, and if the merge did not result in
587 * hand-editing, we will hit this commit and inherit the original
588 * author date and name.
590 * If we are revert, or if our cherry-pick results in a hand merge,
591 * we had better say that the current user is responsible for that.
593 * An exception is when run_git_commit() is called during an
594 * interactive rebase: in that case, we will want to retain the
597 static int run_git_commit(const char *defmsg
, struct replay_opts
*opts
,
598 int allow_empty
, int edit
, int amend
,
599 int cleanup_commit_message
)
602 struct argv_array array
;
606 if (is_rebase_i(opts
)) {
607 env
= read_author_script();
609 const char *gpg_opt
= gpg_sign_opt_quoted(opts
);
611 return error(_(staged_changes_advice
),
616 argv_array_init(&array
);
617 argv_array_push(&array
, "commit");
618 argv_array_push(&array
, "-n");
621 argv_array_push(&array
, "--amend");
623 argv_array_pushf(&array
, "-S%s", opts
->gpg_sign
);
625 argv_array_push(&array
, "-s");
627 argv_array_pushl(&array
, "-F", defmsg
, NULL
);
628 if (cleanup_commit_message
)
629 argv_array_push(&array
, "--cleanup=strip");
631 argv_array_push(&array
, "-e");
632 else if (!cleanup_commit_message
&&
633 !opts
->signoff
&& !opts
->record_origin
&&
634 git_config_get_value("commit.cleanup", &value
))
635 argv_array_push(&array
, "--cleanup=verbatim");
638 argv_array_push(&array
, "--allow-empty");
640 if (opts
->allow_empty_message
)
641 argv_array_push(&array
, "--allow-empty-message");
643 rc
= run_command_v_opt_cd_env(array
.argv
, RUN_GIT_CMD
, NULL
,
644 (const char *const *)env
);
645 argv_array_clear(&array
);
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 */
721 /* commands that do something else than handling a single commit */
723 /* commands that do nothing but are counted for reporting progress */
730 } todo_command_info
[] = {
740 static const char *command_to_string(const enum todo_command command
)
742 if ((size_t)command
< ARRAY_SIZE(todo_command_info
))
743 return todo_command_info
[command
].str
;
744 die("Unknown command: %d", command
);
747 static int is_noop(const enum todo_command command
)
749 return TODO_NOOP
<= (size_t)command
;
752 static int is_fixup(enum todo_command command
)
754 return command
== TODO_FIXUP
|| command
== TODO_SQUASH
;
757 static int update_squash_messages(enum todo_command command
,
758 struct commit
*commit
, struct replay_opts
*opts
)
760 struct strbuf buf
= STRBUF_INIT
;
762 const char *message
, *body
;
764 if (file_exists(rebase_path_squash_msg())) {
765 struct strbuf header
= STRBUF_INIT
;
768 if (strbuf_read_file(&buf
, rebase_path_squash_msg(), 2048) <= 0)
769 return error(_("could not read '%s'"),
770 rebase_path_squash_msg());
773 eol
= strchrnul(buf
.buf
, '\n');
774 if (buf
.buf
[0] != comment_line_char
||
775 (p
+= strcspn(p
, "0123456789\n")) == eol
)
776 return error(_("unexpected 1st line of squash message:"
778 (int)(eol
- buf
.buf
), buf
.buf
);
779 count
= strtol(p
, NULL
, 10);
782 return error(_("invalid 1st line of squash message:\n"
784 (int)(eol
- buf
.buf
), buf
.buf
);
786 strbuf_addf(&header
, "%c ", comment_line_char
);
788 _("This is a combination of %d commits."), ++count
);
789 strbuf_splice(&buf
, 0, eol
- buf
.buf
, header
.buf
, header
.len
);
790 strbuf_release(&header
);
792 unsigned char head
[20];
793 struct commit
*head_commit
;
794 const char *head_message
, *body
;
796 if (get_sha1("HEAD", head
))
797 return error(_("need a HEAD to fixup"));
798 if (!(head_commit
= lookup_commit_reference(head
)))
799 return error(_("could not read HEAD"));
800 if (!(head_message
= get_commit_buffer(head_commit
, NULL
)))
801 return error(_("could not read HEAD's commit message"));
803 find_commit_subject(head_message
, &body
);
804 if (write_message(body
, strlen(body
),
805 rebase_path_fixup_msg(), 0)) {
806 unuse_commit_buffer(head_commit
, head_message
);
807 return error(_("cannot write '%s'"),
808 rebase_path_fixup_msg());
812 strbuf_addf(&buf
, "%c ", comment_line_char
);
813 strbuf_addf(&buf
, _("This is a combination of %d commits."),
815 strbuf_addf(&buf
, "\n%c ", comment_line_char
);
816 strbuf_addstr(&buf
, _("This is the 1st commit message:"));
817 strbuf_addstr(&buf
, "\n\n");
818 strbuf_addstr(&buf
, body
);
820 unuse_commit_buffer(head_commit
, head_message
);
823 if (!(message
= get_commit_buffer(commit
, NULL
)))
824 return error(_("could not read commit message of %s"),
825 oid_to_hex(&commit
->object
.oid
));
826 find_commit_subject(message
, &body
);
828 if (command
== TODO_SQUASH
) {
829 unlink(rebase_path_fixup_msg());
830 strbuf_addf(&buf
, "\n%c ", comment_line_char
);
831 strbuf_addf(&buf
, _("This is the commit message #%d:"), count
);
832 strbuf_addstr(&buf
, "\n\n");
833 strbuf_addstr(&buf
, body
);
834 } else if (command
== TODO_FIXUP
) {
835 strbuf_addf(&buf
, "\n%c ", comment_line_char
);
836 strbuf_addf(&buf
, _("The commit message #%d will be skipped:"),
838 strbuf_addstr(&buf
, "\n\n");
839 strbuf_add_commented_lines(&buf
, body
, strlen(body
));
841 return error(_("unknown command: %d"), command
);
842 unuse_commit_buffer(commit
, message
);
844 res
= write_message(buf
.buf
, buf
.len
, rebase_path_squash_msg(), 0);
845 strbuf_release(&buf
);
849 static int do_pick_commit(enum todo_command command
, struct commit
*commit
,
850 struct replay_opts
*opts
, int final_fixup
)
852 int edit
= opts
->edit
, cleanup_commit_message
= 0;
853 const char *msg_file
= edit
? NULL
: git_path_merge_msg();
854 unsigned char head
[20];
855 struct commit
*base
, *next
, *parent
;
856 const char *base_label
, *next_label
;
857 struct commit_message msg
= { NULL
, NULL
, NULL
, NULL
};
858 struct strbuf msgbuf
= STRBUF_INIT
;
859 int res
, unborn
= 0, amend
= 0, allow
;
861 if (opts
->no_commit
) {
863 * We do not intend to commit immediately. We just want to
864 * merge the differences in, so let's compute the tree
865 * that represents the "current" state for merge-recursive
868 if (write_cache_as_tree(head
, 0, NULL
))
869 return error(_("your index file is unmerged."));
871 unborn
= get_sha1("HEAD", head
);
873 hashcpy(head
, EMPTY_TREE_SHA1_BIN
);
874 if (index_differs_from(unborn
? EMPTY_TREE_SHA1_HEX
: "HEAD", 0, 0))
875 return error_dirty_index(opts
);
879 if (!commit
->parents
)
881 else if (commit
->parents
->next
) {
882 /* Reverting or cherry-picking a merge commit */
884 struct commit_list
*p
;
887 return error(_("commit %s is a merge but no -m option was given."),
888 oid_to_hex(&commit
->object
.oid
));
890 for (cnt
= 1, p
= commit
->parents
;
891 cnt
!= opts
->mainline
&& p
;
894 if (cnt
!= opts
->mainline
|| !p
)
895 return error(_("commit %s does not have parent %d"),
896 oid_to_hex(&commit
->object
.oid
), opts
->mainline
);
898 } else if (0 < opts
->mainline
)
899 return error(_("mainline was specified but commit %s is not a merge."),
900 oid_to_hex(&commit
->object
.oid
));
902 parent
= commit
->parents
->item
;
904 if (opts
->allow_ff
&& !is_fixup(command
) &&
905 ((parent
&& !hashcmp(parent
->object
.oid
.hash
, head
)) ||
906 (!parent
&& unborn
)))
907 return fast_forward_to(commit
->object
.oid
.hash
, head
, unborn
, opts
);
909 if (parent
&& parse_commit(parent
) < 0)
910 /* TRANSLATORS: The first %s will be a "todo" command like
911 "revert" or "pick", the second %s a SHA1. */
912 return error(_("%s: cannot parse parent commit %s"),
913 command_to_string(command
),
914 oid_to_hex(&parent
->object
.oid
));
916 if (get_message(commit
, &msg
) != 0)
917 return error(_("cannot get commit message for %s"),
918 oid_to_hex(&commit
->object
.oid
));
921 * "commit" is an existing commit. We would want to apply
922 * the difference it introduces since its first parent "prev"
923 * on top of the current HEAD if we are cherry-pick. Or the
924 * reverse of it if we are revert.
927 if (command
== TODO_REVERT
) {
929 base_label
= msg
.label
;
931 next_label
= msg
.parent_label
;
932 strbuf_addstr(&msgbuf
, "Revert \"");
933 strbuf_addstr(&msgbuf
, msg
.subject
);
934 strbuf_addstr(&msgbuf
, "\"\n\nThis reverts commit ");
935 strbuf_addstr(&msgbuf
, oid_to_hex(&commit
->object
.oid
));
937 if (commit
->parents
&& commit
->parents
->next
) {
938 strbuf_addstr(&msgbuf
, ", reversing\nchanges made to ");
939 strbuf_addstr(&msgbuf
, oid_to_hex(&parent
->object
.oid
));
941 strbuf_addstr(&msgbuf
, ".\n");
946 base_label
= msg
.parent_label
;
948 next_label
= msg
.label
;
950 /* Append the commit log message to msgbuf. */
951 if (find_commit_subject(msg
.message
, &p
))
952 strbuf_addstr(&msgbuf
, p
);
954 if (opts
->record_origin
) {
955 if (!has_conforming_footer(&msgbuf
, NULL
, 0))
956 strbuf_addch(&msgbuf
, '\n');
957 strbuf_addstr(&msgbuf
, cherry_picked_prefix
);
958 strbuf_addstr(&msgbuf
, oid_to_hex(&commit
->object
.oid
));
959 strbuf_addstr(&msgbuf
, ")\n");
963 if (is_fixup(command
)) {
964 if (update_squash_messages(command
, commit
, opts
))
968 msg_file
= rebase_path_squash_msg();
969 else if (file_exists(rebase_path_fixup_msg())) {
970 cleanup_commit_message
= 1;
971 msg_file
= rebase_path_fixup_msg();
973 const char *dest
= git_path("SQUASH_MSG");
975 if (copy_file(dest
, rebase_path_squash_msg(), 0666))
976 return error(_("could not rename '%s' to '%s'"),
977 rebase_path_squash_msg(), dest
);
978 unlink(git_path("MERGE_MSG"));
984 if (is_rebase_i(opts
) && write_author_script(msg
.message
) < 0)
986 else if (!opts
->strategy
|| !strcmp(opts
->strategy
, "recursive") || command
== TODO_REVERT
) {
987 res
= do_recursive_merge(base
, next
, base_label
, next_label
,
988 head
, &msgbuf
, opts
);
991 res
|= write_message(msgbuf
.buf
, msgbuf
.len
,
992 git_path_merge_msg(), 0);
994 struct commit_list
*common
= NULL
;
995 struct commit_list
*remotes
= NULL
;
997 res
= write_message(msgbuf
.buf
, msgbuf
.len
,
998 git_path_merge_msg(), 0);
1000 commit_list_insert(base
, &common
);
1001 commit_list_insert(next
, &remotes
);
1002 res
|= try_merge_command(opts
->strategy
,
1003 opts
->xopts_nr
, (const char **)opts
->xopts
,
1004 common
, sha1_to_hex(head
), remotes
);
1005 free_commit_list(common
);
1006 free_commit_list(remotes
);
1008 strbuf_release(&msgbuf
);
1011 * If the merge was clean or if it failed due to conflict, we write
1012 * CHERRY_PICK_HEAD for the subsequent invocation of commit to use.
1013 * However, if the merge did not even start, then we don't want to
1016 if (command
== TODO_PICK
&& !opts
->no_commit
&& (res
== 0 || res
== 1) &&
1017 update_ref(NULL
, "CHERRY_PICK_HEAD", commit
->object
.oid
.hash
, NULL
,
1018 REF_NODEREF
, UPDATE_REFS_MSG_ON_ERR
))
1020 if (command
== TODO_REVERT
&& ((opts
->no_commit
&& res
== 0) || res
== 1) &&
1021 update_ref(NULL
, "REVERT_HEAD", commit
->object
.oid
.hash
, NULL
,
1022 REF_NODEREF
, UPDATE_REFS_MSG_ON_ERR
))
1026 error(command
== TODO_REVERT
1027 ? _("could not revert %s... %s")
1028 : _("could not apply %s... %s"),
1029 short_commit_name(commit
), msg
.subject
);
1030 print_advice(res
== 1, opts
);
1031 rerere(opts
->allow_rerere_auto
);
1035 allow
= allow_empty(opts
, commit
);
1040 if (!opts
->no_commit
)
1041 res
= run_git_commit(msg_file
, opts
, allow
, edit
, amend
,
1042 cleanup_commit_message
);
1044 if (!res
&& final_fixup
) {
1045 unlink(rebase_path_fixup_msg());
1046 unlink(rebase_path_squash_msg());
1050 free_message(commit
, &msg
);
1051 update_abort_safety_file();
1056 static int prepare_revs(struct replay_opts
*opts
)
1059 * picking (but not reverting) ranges (but not individual revisions)
1060 * should be done in reverse
1062 if (opts
->action
== REPLAY_PICK
&& !opts
->revs
->no_walk
)
1063 opts
->revs
->reverse
^= 1;
1065 if (prepare_revision_walk(opts
->revs
))
1066 return error(_("revision walk setup failed"));
1068 if (!opts
->revs
->commits
)
1069 return error(_("empty commit set passed"));
1073 static int read_and_refresh_cache(struct replay_opts
*opts
)
1075 static struct lock_file index_lock
;
1076 int index_fd
= hold_locked_index(&index_lock
, 0);
1077 if (read_index_preload(&the_index
, NULL
) < 0) {
1078 rollback_lock_file(&index_lock
);
1079 return error(_("git %s: failed to read the index"),
1080 _(action_name(opts
)));
1082 refresh_index(&the_index
, REFRESH_QUIET
|REFRESH_UNMERGED
, NULL
, NULL
, NULL
);
1083 if (the_index
.cache_changed
&& index_fd
>= 0) {
1084 if (write_locked_index(&the_index
, &index_lock
, COMMIT_LOCK
)) {
1085 rollback_lock_file(&index_lock
);
1086 return error(_("git %s: failed to refresh the index"),
1087 _(action_name(opts
)));
1090 rollback_lock_file(&index_lock
);
1095 enum todo_command command
;
1096 struct commit
*commit
;
1099 size_t offset_in_buf
;
1104 struct todo_item
*items
;
1105 int nr
, alloc
, current
;
1108 #define TODO_LIST_INIT { STRBUF_INIT }
1110 static void todo_list_release(struct todo_list
*todo_list
)
1112 strbuf_release(&todo_list
->buf
);
1113 free(todo_list
->items
);
1114 todo_list
->items
= NULL
;
1115 todo_list
->nr
= todo_list
->alloc
= 0;
1118 static struct todo_item
*append_new_todo(struct todo_list
*todo_list
)
1120 ALLOC_GROW(todo_list
->items
, todo_list
->nr
+ 1, todo_list
->alloc
);
1121 return todo_list
->items
+ todo_list
->nr
++;
1124 static int parse_insn_line(struct todo_item
*item
, const char *bol
, char *eol
)
1126 unsigned char commit_sha1
[20];
1127 char *end_of_object_name
;
1128 int i
, saved
, status
, padding
;
1131 bol
+= strspn(bol
, " \t");
1133 if (bol
== eol
|| *bol
== '\r' || *bol
== comment_line_char
) {
1134 item
->command
= TODO_NOOP
;
1135 item
->commit
= NULL
;
1137 item
->arg_len
= eol
- bol
;
1141 for (i
= 0; i
< ARRAY_SIZE(todo_command_info
); i
++)
1142 if (skip_prefix(bol
, todo_command_info
[i
].str
, &bol
)) {
1145 } else if (bol
[1] == ' ' && *bol
== todo_command_info
[i
].c
) {
1150 if (i
>= ARRAY_SIZE(todo_command_info
))
1153 if (item
->command
== TODO_NOOP
) {
1154 item
->commit
= NULL
;
1156 item
->arg_len
= eol
- bol
;
1160 /* Eat up extra spaces/ tabs before object name */
1161 padding
= strspn(bol
, " \t");
1166 if (item
->command
== TODO_EXEC
) {
1168 item
->arg_len
= (int)(eol
- bol
);
1172 end_of_object_name
= (char *) bol
+ strcspn(bol
, " \t\n");
1173 saved
= *end_of_object_name
;
1174 *end_of_object_name
= '\0';
1175 status
= get_sha1(bol
, commit_sha1
);
1176 *end_of_object_name
= saved
;
1178 item
->arg
= end_of_object_name
+ strspn(end_of_object_name
, " \t");
1179 item
->arg_len
= (int)(eol
- item
->arg
);
1184 item
->commit
= lookup_commit_reference(commit_sha1
);
1185 return !item
->commit
;
1188 static int parse_insn_buffer(char *buf
, struct todo_list
*todo_list
)
1190 struct todo_item
*item
;
1191 char *p
= buf
, *next_p
;
1192 int i
, res
= 0, fixup_okay
= file_exists(rebase_path_done());
1194 for (i
= 1; *p
; i
++, p
= next_p
) {
1195 char *eol
= strchrnul(p
, '\n');
1197 next_p
= *eol
? eol
+ 1 /* skip LF */ : eol
;
1199 if (p
!= eol
&& eol
[-1] == '\r')
1200 eol
--; /* strip Carriage Return */
1202 item
= append_new_todo(todo_list
);
1203 item
->offset_in_buf
= p
- todo_list
->buf
.buf
;
1204 if (parse_insn_line(item
, p
, eol
)) {
1205 res
= error(_("invalid line %d: %.*s"),
1206 i
, (int)(eol
- p
), p
);
1207 item
->command
= TODO_NOOP
;
1212 else if (is_fixup(item
->command
))
1213 return error(_("cannot '%s' without a previous commit"),
1214 command_to_string(item
->command
));
1215 else if (!is_noop(item
->command
))
1219 return error(_("no commits parsed."));
1223 static int read_populate_todo(struct todo_list
*todo_list
,
1224 struct replay_opts
*opts
)
1226 const char *todo_file
= get_todo_path(opts
);
1229 strbuf_reset(&todo_list
->buf
);
1230 fd
= open(todo_file
, O_RDONLY
);
1232 return error_errno(_("could not open '%s'"), todo_file
);
1233 if (strbuf_read(&todo_list
->buf
, fd
, 0) < 0) {
1235 return error(_("could not read '%s'."), todo_file
);
1239 res
= parse_insn_buffer(todo_list
->buf
.buf
, todo_list
);
1241 return error(_("unusable instruction sheet: '%s'"), todo_file
);
1243 if (!is_rebase_i(opts
)) {
1244 enum todo_command valid
=
1245 opts
->action
== REPLAY_PICK
? TODO_PICK
: TODO_REVERT
;
1248 for (i
= 0; i
< todo_list
->nr
; i
++)
1249 if (valid
== todo_list
->items
[i
].command
)
1251 else if (valid
== TODO_PICK
)
1252 return error(_("cannot cherry-pick during a revert."));
1254 return error(_("cannot revert during a cherry-pick."));
1260 static int git_config_string_dup(char **dest
,
1261 const char *var
, const char *value
)
1264 return config_error_nonbool(var
);
1266 *dest
= xstrdup(value
);
1270 static int populate_opts_cb(const char *key
, const char *value
, void *data
)
1272 struct replay_opts
*opts
= data
;
1277 else if (!strcmp(key
, "options.no-commit"))
1278 opts
->no_commit
= git_config_bool_or_int(key
, value
, &error_flag
);
1279 else if (!strcmp(key
, "options.edit"))
1280 opts
->edit
= git_config_bool_or_int(key
, value
, &error_flag
);
1281 else if (!strcmp(key
, "options.signoff"))
1282 opts
->signoff
= git_config_bool_or_int(key
, value
, &error_flag
);
1283 else if (!strcmp(key
, "options.record-origin"))
1284 opts
->record_origin
= git_config_bool_or_int(key
, value
, &error_flag
);
1285 else if (!strcmp(key
, "options.allow-ff"))
1286 opts
->allow_ff
= git_config_bool_or_int(key
, value
, &error_flag
);
1287 else if (!strcmp(key
, "options.mainline"))
1288 opts
->mainline
= git_config_int(key
, value
);
1289 else if (!strcmp(key
, "options.strategy"))
1290 git_config_string_dup(&opts
->strategy
, key
, value
);
1291 else if (!strcmp(key
, "options.gpg-sign"))
1292 git_config_string_dup(&opts
->gpg_sign
, key
, value
);
1293 else if (!strcmp(key
, "options.strategy-option")) {
1294 ALLOC_GROW(opts
->xopts
, opts
->xopts_nr
+ 1, opts
->xopts_alloc
);
1295 opts
->xopts
[opts
->xopts_nr
++] = xstrdup(value
);
1297 return error(_("invalid key: %s"), key
);
1300 return error(_("invalid value for %s: %s"), key
, value
);
1305 static int read_populate_opts(struct replay_opts
*opts
)
1307 if (is_rebase_i(opts
)) {
1308 struct strbuf buf
= STRBUF_INIT
;
1310 if (read_oneliner(&buf
, rebase_path_gpg_sign_opt(), 1)) {
1311 if (!starts_with(buf
.buf
, "-S"))
1314 free(opts
->gpg_sign
);
1315 opts
->gpg_sign
= xstrdup(buf
.buf
+ 2);
1318 strbuf_release(&buf
);
1320 if (file_exists(rebase_path_verbose()))
1326 if (!file_exists(git_path_opts_file()))
1329 * The function git_parse_source(), called from git_config_from_file(),
1330 * may die() in case of a syntactically incorrect file. We do not care
1331 * about this case, though, because we wrote that file ourselves, so we
1332 * are pretty certain that it is syntactically correct.
1334 if (git_config_from_file(populate_opts_cb
, git_path_opts_file(), opts
) < 0)
1335 return error(_("malformed options sheet: '%s'"),
1336 git_path_opts_file());
1340 static int walk_revs_populate_todo(struct todo_list
*todo_list
,
1341 struct replay_opts
*opts
)
1343 enum todo_command command
= opts
->action
== REPLAY_PICK
?
1344 TODO_PICK
: TODO_REVERT
;
1345 const char *command_string
= todo_command_info
[command
].str
;
1346 struct commit
*commit
;
1348 if (prepare_revs(opts
))
1351 while ((commit
= get_revision(opts
->revs
))) {
1352 struct todo_item
*item
= append_new_todo(todo_list
);
1353 const char *commit_buffer
= get_commit_buffer(commit
, NULL
);
1354 const char *subject
;
1357 item
->command
= command
;
1358 item
->commit
= commit
;
1361 item
->offset_in_buf
= todo_list
->buf
.len
;
1362 subject_len
= find_commit_subject(commit_buffer
, &subject
);
1363 strbuf_addf(&todo_list
->buf
, "%s %s %.*s\n", command_string
,
1364 short_commit_name(commit
), subject_len
, subject
);
1365 unuse_commit_buffer(commit
, commit_buffer
);
1370 static int create_seq_dir(void)
1372 if (file_exists(git_path_seq_dir())) {
1373 error(_("a cherry-pick or revert is already in progress"));
1374 advise(_("try \"git cherry-pick (--continue | --quit | --abort)\""));
1376 } else if (mkdir(git_path_seq_dir(), 0777) < 0)
1377 return error_errno(_("could not create sequencer directory '%s'"),
1378 git_path_seq_dir());
1382 static int save_head(const char *head
)
1384 static struct lock_file head_lock
;
1385 struct strbuf buf
= STRBUF_INIT
;
1388 fd
= hold_lock_file_for_update(&head_lock
, git_path_head_file(), 0);
1390 rollback_lock_file(&head_lock
);
1391 return error_errno(_("could not lock HEAD"));
1393 strbuf_addf(&buf
, "%s\n", head
);
1394 if (write_in_full(fd
, buf
.buf
, buf
.len
) < 0) {
1395 rollback_lock_file(&head_lock
);
1396 return error_errno(_("could not write to '%s'"),
1397 git_path_head_file());
1399 if (commit_lock_file(&head_lock
) < 0) {
1400 rollback_lock_file(&head_lock
);
1401 return error(_("failed to finalize '%s'."), git_path_head_file());
1406 static int rollback_is_safe(void)
1408 struct strbuf sb
= STRBUF_INIT
;
1409 struct object_id expected_head
, actual_head
;
1411 if (strbuf_read_file(&sb
, git_path_abort_safety_file(), 0) >= 0) {
1413 if (get_oid_hex(sb
.buf
, &expected_head
)) {
1414 strbuf_release(&sb
);
1415 die(_("could not parse %s"), git_path_abort_safety_file());
1417 strbuf_release(&sb
);
1419 else if (errno
== ENOENT
)
1420 oidclr(&expected_head
);
1422 die_errno(_("could not read '%s'"), git_path_abort_safety_file());
1424 if (get_oid("HEAD", &actual_head
))
1425 oidclr(&actual_head
);
1427 return !oidcmp(&actual_head
, &expected_head
);
1430 static int reset_for_rollback(const unsigned char *sha1
)
1432 const char *argv
[4]; /* reset --merge <arg> + NULL */
1435 argv
[1] = "--merge";
1436 argv
[2] = sha1_to_hex(sha1
);
1438 return run_command_v_opt(argv
, RUN_GIT_CMD
);
1441 static int rollback_single_pick(void)
1443 unsigned char head_sha1
[20];
1445 if (!file_exists(git_path_cherry_pick_head()) &&
1446 !file_exists(git_path_revert_head()))
1447 return error(_("no cherry-pick or revert in progress"));
1448 if (read_ref_full("HEAD", 0, head_sha1
, NULL
))
1449 return error(_("cannot resolve HEAD"));
1450 if (is_null_sha1(head_sha1
))
1451 return error(_("cannot abort from a branch yet to be born"));
1452 return reset_for_rollback(head_sha1
);
1455 int sequencer_rollback(struct replay_opts
*opts
)
1458 unsigned char sha1
[20];
1459 struct strbuf buf
= STRBUF_INIT
;
1461 f
= fopen(git_path_head_file(), "r");
1462 if (!f
&& errno
== ENOENT
) {
1464 * There is no multiple-cherry-pick in progress.
1465 * If CHERRY_PICK_HEAD or REVERT_HEAD indicates
1466 * a single-cherry-pick in progress, abort that.
1468 return rollback_single_pick();
1471 return error_errno(_("cannot open '%s'"), git_path_head_file());
1472 if (strbuf_getline_lf(&buf
, f
)) {
1473 error(_("cannot read '%s': %s"), git_path_head_file(),
1474 ferror(f
) ? strerror(errno
) : _("unexpected end of file"));
1479 if (get_sha1_hex(buf
.buf
, sha1
) || buf
.buf
[40] != '\0') {
1480 error(_("stored pre-cherry-pick HEAD file '%s' is corrupt"),
1481 git_path_head_file());
1484 if (is_null_sha1(sha1
)) {
1485 error(_("cannot abort from a branch yet to be born"));
1489 if (!rollback_is_safe()) {
1490 /* Do not error, just do not rollback */
1491 warning(_("You seem to have moved HEAD. "
1492 "Not rewinding, check your HEAD!"));
1494 if (reset_for_rollback(sha1
))
1496 strbuf_release(&buf
);
1497 return sequencer_remove_state(opts
);
1499 strbuf_release(&buf
);
1503 static int save_todo(struct todo_list
*todo_list
, struct replay_opts
*opts
)
1505 static struct lock_file todo_lock
;
1506 const char *todo_path
= get_todo_path(opts
);
1507 int next
= todo_list
->current
, offset
, fd
;
1510 * rebase -i writes "git-rebase-todo" without the currently executing
1511 * command, appending it to "done" instead.
1513 if (is_rebase_i(opts
))
1516 fd
= hold_lock_file_for_update(&todo_lock
, todo_path
, 0);
1518 return error_errno(_("could not lock '%s'"), todo_path
);
1519 offset
= next
< todo_list
->nr
?
1520 todo_list
->items
[next
].offset_in_buf
: todo_list
->buf
.len
;
1521 if (write_in_full(fd
, todo_list
->buf
.buf
+ offset
,
1522 todo_list
->buf
.len
- offset
) < 0)
1523 return error_errno(_("could not write to '%s'"), todo_path
);
1524 if (commit_lock_file(&todo_lock
) < 0)
1525 return error(_("failed to finalize '%s'."), todo_path
);
1527 if (is_rebase_i(opts
)) {
1528 const char *done_path
= rebase_path_done();
1529 int fd
= open(done_path
, O_CREAT
| O_WRONLY
| O_APPEND
, 0666);
1530 int prev_offset
= !next
? 0 :
1531 todo_list
->items
[next
- 1].offset_in_buf
;
1533 if (fd
>= 0 && offset
> prev_offset
&&
1534 write_in_full(fd
, todo_list
->buf
.buf
+ prev_offset
,
1535 offset
- prev_offset
) < 0) {
1537 return error_errno(_("could not write to '%s'"),
1546 static int save_opts(struct replay_opts
*opts
)
1548 const char *opts_file
= git_path_opts_file();
1551 if (opts
->no_commit
)
1552 res
|= git_config_set_in_file_gently(opts_file
, "options.no-commit", "true");
1554 res
|= git_config_set_in_file_gently(opts_file
, "options.edit", "true");
1556 res
|= git_config_set_in_file_gently(opts_file
, "options.signoff", "true");
1557 if (opts
->record_origin
)
1558 res
|= git_config_set_in_file_gently(opts_file
, "options.record-origin", "true");
1560 res
|= git_config_set_in_file_gently(opts_file
, "options.allow-ff", "true");
1561 if (opts
->mainline
) {
1562 struct strbuf buf
= STRBUF_INIT
;
1563 strbuf_addf(&buf
, "%d", opts
->mainline
);
1564 res
|= git_config_set_in_file_gently(opts_file
, "options.mainline", buf
.buf
);
1565 strbuf_release(&buf
);
1568 res
|= git_config_set_in_file_gently(opts_file
, "options.strategy", opts
->strategy
);
1570 res
|= git_config_set_in_file_gently(opts_file
, "options.gpg-sign", opts
->gpg_sign
);
1573 for (i
= 0; i
< opts
->xopts_nr
; i
++)
1574 res
|= git_config_set_multivar_in_file_gently(opts_file
,
1575 "options.strategy-option",
1576 opts
->xopts
[i
], "^$", 0);
1581 static int make_patch(struct commit
*commit
, struct replay_opts
*opts
)
1583 struct strbuf buf
= STRBUF_INIT
;
1584 struct rev_info log_tree_opt
;
1585 const char *subject
, *p
;
1588 p
= short_commit_name(commit
);
1589 if (write_message(p
, strlen(p
), rebase_path_stopped_sha(), 1) < 0)
1592 strbuf_addf(&buf
, "%s/patch", get_dir(opts
));
1593 memset(&log_tree_opt
, 0, sizeof(log_tree_opt
));
1594 init_revisions(&log_tree_opt
, NULL
);
1595 log_tree_opt
.abbrev
= 0;
1596 log_tree_opt
.diff
= 1;
1597 log_tree_opt
.diffopt
.output_format
= DIFF_FORMAT_PATCH
;
1598 log_tree_opt
.disable_stdin
= 1;
1599 log_tree_opt
.no_commit_id
= 1;
1600 log_tree_opt
.diffopt
.file
= fopen(buf
.buf
, "w");
1601 log_tree_opt
.diffopt
.use_color
= GIT_COLOR_NEVER
;
1602 if (!log_tree_opt
.diffopt
.file
)
1603 res
|= error_errno(_("could not open '%s'"), buf
.buf
);
1605 res
|= log_tree_commit(&log_tree_opt
, commit
);
1606 fclose(log_tree_opt
.diffopt
.file
);
1610 strbuf_addf(&buf
, "%s/message", get_dir(opts
));
1611 if (!file_exists(buf
.buf
)) {
1612 const char *commit_buffer
= get_commit_buffer(commit
, NULL
);
1613 find_commit_subject(commit_buffer
, &subject
);
1614 res
|= write_message(subject
, strlen(subject
), buf
.buf
, 1);
1615 unuse_commit_buffer(commit
, commit_buffer
);
1617 strbuf_release(&buf
);
1622 static int intend_to_amend(void)
1624 unsigned char head
[20];
1627 if (get_sha1("HEAD", head
))
1628 return error(_("cannot read HEAD"));
1630 p
= sha1_to_hex(head
);
1631 return write_message(p
, strlen(p
), rebase_path_amend(), 1);
1634 static int error_with_patch(struct commit
*commit
,
1635 const char *subject
, int subject_len
,
1636 struct replay_opts
*opts
, int exit_code
, int to_amend
)
1638 if (make_patch(commit
, opts
))
1642 if (intend_to_amend())
1645 fprintf(stderr
, "You can amend the commit now, with\n"
1647 " git commit --amend %s\n"
1649 "Once you are satisfied with your changes, run\n"
1651 " git rebase --continue\n", gpg_sign_opt_quoted(opts
));
1652 } else if (exit_code
)
1653 fprintf(stderr
, "Could not apply %s... %.*s\n",
1654 short_commit_name(commit
), subject_len
, subject
);
1659 static int error_failed_squash(struct commit
*commit
,
1660 struct replay_opts
*opts
, int subject_len
, const char *subject
)
1662 if (rename(rebase_path_squash_msg(), rebase_path_message()))
1663 return error(_("could not rename '%s' to '%s'"),
1664 rebase_path_squash_msg(), rebase_path_message());
1665 unlink(rebase_path_fixup_msg());
1666 unlink(git_path("MERGE_MSG"));
1667 if (copy_file(git_path("MERGE_MSG"), rebase_path_message(), 0666))
1668 return error(_("could not copy '%s' to '%s'"),
1669 rebase_path_message(), git_path("MERGE_MSG"));
1670 return error_with_patch(commit
, subject
, subject_len
, opts
, 1, 0);
1673 static int do_exec(const char *command_line
)
1675 const char *child_argv
[] = { NULL
, NULL
};
1678 fprintf(stderr
, "Executing: %s\n", command_line
);
1679 child_argv
[0] = command_line
;
1680 status
= run_command_v_opt(child_argv
, RUN_USING_SHELL
);
1682 /* force re-reading of the cache */
1683 if (discard_cache() < 0 || read_cache() < 0)
1684 return error(_("could not read index"));
1686 dirty
= require_clean_work_tree("rebase", NULL
, 1, 1);
1689 warning(_("execution failed: %s\n%s"
1690 "You can fix the problem, and then run\n"
1692 " git rebase --continue\n"
1695 dirty
? N_("and made changes to the index and/or the "
1696 "working tree\n") : "");
1698 /* command not found */
1701 warning(_("execution succeeded: %s\nbut "
1702 "left changes to the index and/or the working tree\n"
1703 "Commit or stash your changes, and then run\n"
1705 " git rebase --continue\n"
1706 "\n"), command_line
);
1713 static int is_final_fixup(struct todo_list
*todo_list
)
1715 int i
= todo_list
->current
;
1717 if (!is_fixup(todo_list
->items
[i
].command
))
1720 while (++i
< todo_list
->nr
)
1721 if (is_fixup(todo_list
->items
[i
].command
))
1723 else if (!is_noop(todo_list
->items
[i
].command
))
1728 static int pick_commits(struct todo_list
*todo_list
, struct replay_opts
*opts
)
1732 setenv(GIT_REFLOG_ACTION
, action_name(opts
), 0);
1734 assert(!(opts
->signoff
|| opts
->no_commit
||
1735 opts
->record_origin
|| opts
->edit
));
1736 if (read_and_refresh_cache(opts
))
1739 while (todo_list
->current
< todo_list
->nr
) {
1740 struct todo_item
*item
= todo_list
->items
+ todo_list
->current
;
1741 if (save_todo(todo_list
, opts
))
1743 if (is_rebase_i(opts
)) {
1744 unlink(rebase_path_message());
1745 unlink(rebase_path_author_script());
1746 unlink(rebase_path_stopped_sha());
1747 unlink(rebase_path_amend());
1749 if (item
->command
<= TODO_SQUASH
) {
1750 res
= do_pick_commit(item
->command
, item
->commit
,
1751 opts
, is_final_fixup(todo_list
));
1752 if (item
->command
== TODO_EDIT
) {
1753 struct commit
*commit
= item
->commit
;
1755 warning(_("stopped at %s... %.*s"),
1756 short_commit_name(commit
),
1757 item
->arg_len
, item
->arg
);
1758 return error_with_patch(commit
,
1759 item
->arg
, item
->arg_len
, opts
, res
,
1762 if (res
&& is_fixup(item
->command
)) {
1765 return error_failed_squash(item
->commit
, opts
,
1766 item
->arg_len
, item
->arg
);
1768 } else if (item
->command
== TODO_EXEC
) {
1769 char *end_of_arg
= (char *)(item
->arg
+ item
->arg_len
);
1770 int saved
= *end_of_arg
;
1773 res
= do_exec(item
->arg
);
1774 *end_of_arg
= saved
;
1775 } else if (!is_noop(item
->command
))
1776 return error(_("unknown command %d"), item
->command
);
1778 todo_list
->current
++;
1783 if (is_rebase_i(opts
)) {
1784 struct strbuf buf
= STRBUF_INIT
;
1786 /* Stopped in the middle, as planned? */
1787 if (todo_list
->current
< todo_list
->nr
)
1790 if (opts
->verbose
) {
1791 struct rev_info log_tree_opt
;
1792 struct object_id orig
, head
;
1794 memset(&log_tree_opt
, 0, sizeof(log_tree_opt
));
1795 init_revisions(&log_tree_opt
, NULL
);
1796 log_tree_opt
.diff
= 1;
1797 log_tree_opt
.diffopt
.output_format
=
1798 DIFF_FORMAT_DIFFSTAT
;
1799 log_tree_opt
.disable_stdin
= 1;
1801 if (read_oneliner(&buf
, rebase_path_orig_head(), 0) &&
1802 !get_sha1(buf
.buf
, orig
.hash
) &&
1803 !get_sha1("HEAD", head
.hash
)) {
1804 diff_tree_sha1(orig
.hash
, head
.hash
,
1805 "", &log_tree_opt
.diffopt
);
1806 log_tree_diff_flush(&log_tree_opt
);
1809 strbuf_release(&buf
);
1813 * Sequence of picks finished successfully; cleanup by
1814 * removing the .git/sequencer directory
1816 return sequencer_remove_state(opts
);
1819 static int continue_single_pick(void)
1821 const char *argv
[] = { "commit", NULL
};
1823 if (!file_exists(git_path_cherry_pick_head()) &&
1824 !file_exists(git_path_revert_head()))
1825 return error(_("no cherry-pick or revert in progress"));
1826 return run_command_v_opt(argv
, RUN_GIT_CMD
);
1829 static int commit_staged_changes(struct replay_opts
*opts
)
1833 if (has_unstaged_changes(1))
1834 return error(_("cannot rebase: You have unstaged changes."));
1835 if (!has_uncommitted_changes(0)) {
1836 const char *cherry_pick_head
= git_path("CHERRY_PICK_HEAD");
1838 if (file_exists(cherry_pick_head
) && unlink(cherry_pick_head
))
1839 return error(_("could not remove CHERRY_PICK_HEAD"));
1843 if (file_exists(rebase_path_amend())) {
1844 struct strbuf rev
= STRBUF_INIT
;
1845 unsigned char head
[20], to_amend
[20];
1847 if (get_sha1("HEAD", head
))
1848 return error(_("cannot amend non-existing commit"));
1849 if (!read_oneliner(&rev
, rebase_path_amend(), 0))
1850 return error(_("invalid file: '%s'"), rebase_path_amend());
1851 if (get_sha1_hex(rev
.buf
, to_amend
))
1852 return error(_("invalid contents: '%s'"),
1853 rebase_path_amend());
1854 if (hashcmp(head
, to_amend
))
1855 return error(_("\nYou have uncommitted changes in your "
1856 "working tree. Please, commit them\n"
1857 "first and then run 'git rebase "
1858 "--continue' again."));
1860 strbuf_release(&rev
);
1864 if (run_git_commit(rebase_path_message(), opts
, 1, 1, amend
, 0))
1865 return error(_("could not commit staged changes."));
1866 unlink(rebase_path_amend());
1870 int sequencer_continue(struct replay_opts
*opts
)
1872 struct todo_list todo_list
= TODO_LIST_INIT
;
1875 if (read_and_refresh_cache(opts
))
1878 if (is_rebase_i(opts
)) {
1879 if (commit_staged_changes(opts
))
1882 if (!file_exists(get_todo_path(opts
)))
1883 return continue_single_pick();
1884 if (read_populate_opts(opts
))
1886 if ((res
= read_populate_todo(&todo_list
, opts
)))
1887 goto release_todo_list
;
1889 /* Verify that the conflict has been resolved */
1890 if (file_exists(git_path_cherry_pick_head()) ||
1891 file_exists(git_path_revert_head())) {
1892 res
= continue_single_pick();
1894 goto release_todo_list
;
1896 if (index_differs_from("HEAD", 0, 0)) {
1897 res
= error_dirty_index(opts
);
1898 goto release_todo_list
;
1900 todo_list
.current
++;
1901 res
= pick_commits(&todo_list
, opts
);
1903 todo_list_release(&todo_list
);
1907 static int single_pick(struct commit
*cmit
, struct replay_opts
*opts
)
1909 setenv(GIT_REFLOG_ACTION
, action_name(opts
), 0);
1910 return do_pick_commit(opts
->action
== REPLAY_PICK
?
1911 TODO_PICK
: TODO_REVERT
, cmit
, opts
, 0);
1914 int sequencer_pick_revisions(struct replay_opts
*opts
)
1916 struct todo_list todo_list
= TODO_LIST_INIT
;
1917 unsigned char sha1
[20];
1921 if (read_and_refresh_cache(opts
))
1924 for (i
= 0; i
< opts
->revs
->pending
.nr
; i
++) {
1925 unsigned char sha1
[20];
1926 const char *name
= opts
->revs
->pending
.objects
[i
].name
;
1928 /* This happens when using --stdin. */
1932 if (!get_sha1(name
, sha1
)) {
1933 if (!lookup_commit_reference_gently(sha1
, 1)) {
1934 enum object_type type
= sha1_object_info(sha1
, NULL
);
1935 return error(_("%s: can't cherry-pick a %s"),
1936 name
, typename(type
));
1939 return error(_("%s: bad revision"), name
);
1943 * If we were called as "git cherry-pick <commit>", just
1944 * cherry-pick/revert it, set CHERRY_PICK_HEAD /
1945 * REVERT_HEAD, and don't touch the sequencer state.
1946 * This means it is possible to cherry-pick in the middle
1947 * of a cherry-pick sequence.
1949 if (opts
->revs
->cmdline
.nr
== 1 &&
1950 opts
->revs
->cmdline
.rev
->whence
== REV_CMD_REV
&&
1951 opts
->revs
->no_walk
&&
1952 !opts
->revs
->cmdline
.rev
->flags
) {
1953 struct commit
*cmit
;
1954 if (prepare_revision_walk(opts
->revs
))
1955 return error(_("revision walk setup failed"));
1956 cmit
= get_revision(opts
->revs
);
1957 if (!cmit
|| get_revision(opts
->revs
))
1958 return error("BUG: expected exactly one commit from walk");
1959 return single_pick(cmit
, opts
);
1963 * Start a new cherry-pick/ revert sequence; but
1964 * first, make sure that an existing one isn't in
1968 if (walk_revs_populate_todo(&todo_list
, opts
) ||
1969 create_seq_dir() < 0)
1971 if (get_sha1("HEAD", sha1
) && (opts
->action
== REPLAY_REVERT
))
1972 return error(_("can't revert as initial commit"));
1973 if (save_head(sha1_to_hex(sha1
)))
1975 if (save_opts(opts
))
1977 update_abort_safety_file();
1978 res
= pick_commits(&todo_list
, opts
);
1979 todo_list_release(&todo_list
);
1983 void append_signoff(struct strbuf
*msgbuf
, int ignore_footer
, unsigned flag
)
1985 unsigned no_dup_sob
= flag
& APPEND_SIGNOFF_DEDUP
;
1986 struct strbuf sob
= STRBUF_INIT
;
1989 strbuf_addstr(&sob
, sign_off_header
);
1990 strbuf_addstr(&sob
, fmt_name(getenv("GIT_COMMITTER_NAME"),
1991 getenv("GIT_COMMITTER_EMAIL")));
1992 strbuf_addch(&sob
, '\n');
1995 * If the whole message buffer is equal to the sob, pretend that we
1996 * found a conforming footer with a matching sob
1998 if (msgbuf
->len
- ignore_footer
== sob
.len
&&
1999 !strncmp(msgbuf
->buf
, sob
.buf
, sob
.len
))
2002 has_footer
= has_conforming_footer(msgbuf
, &sob
, ignore_footer
);
2005 const char *append_newlines
= NULL
;
2006 size_t len
= msgbuf
->len
- ignore_footer
;
2010 * The buffer is completely empty. Leave foom for
2011 * the title and body to be filled in by the user.
2013 append_newlines
= "\n\n";
2014 } else if (msgbuf
->buf
[len
- 1] != '\n') {
2016 * Incomplete line. Complete the line and add a
2017 * blank one so that there is an empty line between
2018 * the message body and the sob.
2020 append_newlines
= "\n\n";
2021 } else if (len
== 1) {
2023 * Buffer contains a single newline. Add another
2024 * so that we leave room for the title and body.
2026 append_newlines
= "\n";
2027 } else if (msgbuf
->buf
[len
- 2] != '\n') {
2029 * Buffer ends with a single newline. Add another
2030 * so that there is an empty line between the message
2033 append_newlines
= "\n";
2034 } /* else, the buffer already ends with two newlines. */
2036 if (append_newlines
)
2037 strbuf_splice(msgbuf
, msgbuf
->len
- ignore_footer
, 0,
2038 append_newlines
, strlen(append_newlines
));
2041 if (has_footer
!= 3 && (!no_dup_sob
|| has_footer
!= 2))
2042 strbuf_splice(msgbuf
, msgbuf
->len
- ignore_footer
, 0,
2045 strbuf_release(&sob
);