stash: remove now superfluos help for "stash push"
[git.git] / sequencer.c
blobf2a10cc4f24c10adf072eb26ba427f00037b3c79
1 #include "cache.h"
2 #include "config.h"
3 #include "lockfile.h"
4 #include "sequencer.h"
5 #include "dir.h"
6 #include "object.h"
7 #include "commit.h"
8 #include "tag.h"
9 #include "run-command.h"
10 #include "exec_cmd.h"
11 #include "utf8.h"
12 #include "cache-tree.h"
13 #include "diff.h"
14 #include "revision.h"
15 #include "rerere.h"
16 #include "merge-recursive.h"
17 #include "refs.h"
18 #include "argv-array.h"
19 #include "quote.h"
20 #include "trailer.h"
21 #include "log-tree.h"
22 #include "wt-status.h"
23 #include "hashmap.h"
25 #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
27 const char sign_off_header[] = "Signed-off-by: ";
28 static const char cherry_picked_prefix[] = "(cherry picked from commit ";
30 GIT_PATH_FUNC(git_path_seq_dir, "sequencer")
32 static GIT_PATH_FUNC(git_path_todo_file, "sequencer/todo")
33 static GIT_PATH_FUNC(git_path_opts_file, "sequencer/opts")
34 static GIT_PATH_FUNC(git_path_head_file, "sequencer/head")
35 static GIT_PATH_FUNC(git_path_abort_safety_file, "sequencer/abort-safety")
37 static GIT_PATH_FUNC(rebase_path, "rebase-merge")
39 * The file containing rebase commands, comments, and empty lines.
40 * This file is created by "git rebase -i" then edited by the user. As
41 * the lines are processed, they are removed from the front of this
42 * file and written to the tail of 'done'.
44 static GIT_PATH_FUNC(rebase_path_todo, "rebase-merge/git-rebase-todo")
46 * The rebase command lines that have already been processed. A line
47 * is moved here when it is first handled, before any associated user
48 * actions.
50 static GIT_PATH_FUNC(rebase_path_done, "rebase-merge/done")
52 * The file to keep track of how many commands were already processed (e.g.
53 * for the prompt).
55 static GIT_PATH_FUNC(rebase_path_msgnum, "rebase-merge/msgnum");
57 * The file to keep track of how many commands are to be processed in total
58 * (e.g. for the prompt).
60 static GIT_PATH_FUNC(rebase_path_msgtotal, "rebase-merge/end");
62 * The commit message that is planned to be used for any changes that
63 * need to be committed following a user interaction.
65 static GIT_PATH_FUNC(rebase_path_message, "rebase-merge/message")
67 * The file into which is accumulated the suggested commit message for
68 * squash/fixup commands. When the first of a series of squash/fixups
69 * is seen, the file is created and the commit message from the
70 * previous commit and from the first squash/fixup commit are written
71 * to it. The commit message for each subsequent squash/fixup commit
72 * is appended to the file as it is processed.
74 * The first line of the file is of the form
75 * # This is a combination of $count commits.
76 * where $count is the number of commits whose messages have been
77 * written to the file so far (including the initial "pick" commit).
78 * Each time that a commit message is processed, this line is read and
79 * updated. It is deleted just before the combined commit is made.
81 static GIT_PATH_FUNC(rebase_path_squash_msg, "rebase-merge/message-squash")
83 * If the current series of squash/fixups has not yet included a squash
84 * command, then this file exists and holds the commit message of the
85 * original "pick" commit. (If the series ends without a "squash"
86 * command, then this can be used as the commit message of the combined
87 * commit without opening the editor.)
89 static GIT_PATH_FUNC(rebase_path_fixup_msg, "rebase-merge/message-fixup")
91 * A script to set the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and
92 * GIT_AUTHOR_DATE that will be used for the commit that is currently
93 * being rebased.
95 static GIT_PATH_FUNC(rebase_path_author_script, "rebase-merge/author-script")
97 * When an "edit" rebase command is being processed, the SHA1 of the
98 * commit to be edited is recorded in this file. When "git rebase
99 * --continue" is executed, if there are any staged changes then they
100 * will be amended to the HEAD commit, but only provided the HEAD
101 * commit is still the commit to be edited. When any other rebase
102 * command is processed, this file is deleted.
104 static GIT_PATH_FUNC(rebase_path_amend, "rebase-merge/amend")
106 * When we stop at a given patch via the "edit" command, this file contains
107 * the abbreviated commit name of the corresponding patch.
109 static GIT_PATH_FUNC(rebase_path_stopped_sha, "rebase-merge/stopped-sha")
111 * For the post-rewrite hook, we make a list of rewritten commits and
112 * their new sha1s. The rewritten-pending list keeps the sha1s of
113 * commits that have been processed, but not committed yet,
114 * e.g. because they are waiting for a 'squash' command.
116 static GIT_PATH_FUNC(rebase_path_rewritten_list, "rebase-merge/rewritten-list")
117 static GIT_PATH_FUNC(rebase_path_rewritten_pending,
118 "rebase-merge/rewritten-pending")
120 * The following files are written by git-rebase just after parsing the
121 * command-line (and are only consumed, not modified, by the sequencer).
123 static GIT_PATH_FUNC(rebase_path_gpg_sign_opt, "rebase-merge/gpg_sign_opt")
124 static GIT_PATH_FUNC(rebase_path_orig_head, "rebase-merge/orig-head")
125 static GIT_PATH_FUNC(rebase_path_verbose, "rebase-merge/verbose")
126 static GIT_PATH_FUNC(rebase_path_head_name, "rebase-merge/head-name")
127 static GIT_PATH_FUNC(rebase_path_onto, "rebase-merge/onto")
128 static GIT_PATH_FUNC(rebase_path_autostash, "rebase-merge/autostash")
129 static GIT_PATH_FUNC(rebase_path_strategy, "rebase-merge/strategy")
130 static GIT_PATH_FUNC(rebase_path_strategy_opts, "rebase-merge/strategy_opts")
131 static GIT_PATH_FUNC(rebase_path_allow_rerere_autoupdate, "rebase-merge/allow_rerere_autoupdate")
133 static inline int is_rebase_i(const struct replay_opts *opts)
135 return opts->action == REPLAY_INTERACTIVE_REBASE;
138 static const char *get_dir(const struct replay_opts *opts)
140 if (is_rebase_i(opts))
141 return rebase_path();
142 return git_path_seq_dir();
145 static const char *get_todo_path(const struct replay_opts *opts)
147 if (is_rebase_i(opts))
148 return rebase_path_todo();
149 return git_path_todo_file();
153 * Returns 0 for non-conforming footer
154 * Returns 1 for conforming footer
155 * Returns 2 when sob exists within conforming footer
156 * Returns 3 when sob exists within conforming footer as last entry
158 static int has_conforming_footer(struct strbuf *sb, struct strbuf *sob,
159 int ignore_footer)
161 struct trailer_info info;
162 int i;
163 int found_sob = 0, found_sob_last = 0;
165 trailer_info_get(&info, sb->buf);
167 if (info.trailer_start == info.trailer_end)
168 return 0;
170 for (i = 0; i < info.trailer_nr; i++)
171 if (sob && !strncmp(info.trailers[i], sob->buf, sob->len)) {
172 found_sob = 1;
173 if (i == info.trailer_nr - 1)
174 found_sob_last = 1;
177 trailer_info_release(&info);
179 if (found_sob_last)
180 return 3;
181 if (found_sob)
182 return 2;
183 return 1;
186 static const char *gpg_sign_opt_quoted(struct replay_opts *opts)
188 static struct strbuf buf = STRBUF_INIT;
190 strbuf_reset(&buf);
191 if (opts->gpg_sign)
192 sq_quotef(&buf, "-S%s", opts->gpg_sign);
193 return buf.buf;
196 int sequencer_remove_state(struct replay_opts *opts)
198 struct strbuf dir = STRBUF_INIT;
199 int i;
201 free(opts->gpg_sign);
202 free(opts->strategy);
203 for (i = 0; i < opts->xopts_nr; i++)
204 free(opts->xopts[i]);
205 free(opts->xopts);
207 strbuf_addstr(&dir, get_dir(opts));
208 remove_dir_recursively(&dir, 0);
209 strbuf_release(&dir);
211 return 0;
214 static const char *action_name(const struct replay_opts *opts)
216 switch (opts->action) {
217 case REPLAY_REVERT:
218 return N_("revert");
219 case REPLAY_PICK:
220 return N_("cherry-pick");
221 case REPLAY_INTERACTIVE_REBASE:
222 return N_("rebase -i");
224 die(_("Unknown action: %d"), opts->action);
227 struct commit_message {
228 char *parent_label;
229 char *label;
230 char *subject;
231 const char *message;
234 static const char *short_commit_name(struct commit *commit)
236 return find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV);
239 static int get_message(struct commit *commit, struct commit_message *out)
241 const char *abbrev, *subject;
242 int subject_len;
244 out->message = logmsg_reencode(commit, NULL, get_commit_output_encoding());
245 abbrev = short_commit_name(commit);
247 subject_len = find_commit_subject(out->message, &subject);
249 out->subject = xmemdupz(subject, subject_len);
250 out->label = xstrfmt("%s... %s", abbrev, out->subject);
251 out->parent_label = xstrfmt("parent of %s", out->label);
253 return 0;
256 static void free_message(struct commit *commit, struct commit_message *msg)
258 free(msg->parent_label);
259 free(msg->label);
260 free(msg->subject);
261 unuse_commit_buffer(commit, msg->message);
264 static void print_advice(int show_hint, struct replay_opts *opts)
266 char *msg = getenv("GIT_CHERRY_PICK_HELP");
268 if (msg) {
269 fprintf(stderr, "%s\n", msg);
271 * A conflict has occurred but the porcelain
272 * (typically rebase --interactive) wants to take care
273 * of the commit itself so remove CHERRY_PICK_HEAD
275 unlink(git_path_cherry_pick_head());
276 return;
279 if (show_hint) {
280 if (opts->no_commit)
281 advise(_("after resolving the conflicts, mark the corrected paths\n"
282 "with 'git add <paths>' or 'git rm <paths>'"));
283 else
284 advise(_("after resolving the conflicts, mark the corrected paths\n"
285 "with 'git add <paths>' or 'git rm <paths>'\n"
286 "and commit the result with 'git commit'"));
290 static int write_message(const void *buf, size_t len, const char *filename,
291 int append_eol)
293 static struct lock_file msg_file;
295 int msg_fd = hold_lock_file_for_update(&msg_file, filename, 0);
296 if (msg_fd < 0)
297 return error_errno(_("could not lock '%s'"), filename);
298 if (write_in_full(msg_fd, buf, len) < 0) {
299 rollback_lock_file(&msg_file);
300 return error_errno(_("could not write to '%s'"), filename);
302 if (append_eol && write(msg_fd, "\n", 1) < 0) {
303 rollback_lock_file(&msg_file);
304 return error_errno(_("could not write eol to '%s'"), filename);
306 if (commit_lock_file(&msg_file) < 0) {
307 rollback_lock_file(&msg_file);
308 return error(_("failed to finalize '%s'."), filename);
311 return 0;
315 * Reads a file that was presumably written by a shell script, i.e. with an
316 * end-of-line marker that needs to be stripped.
318 * Note that only the last end-of-line marker is stripped, consistent with the
319 * behavior of "$(cat path)" in a shell script.
321 * Returns 1 if the file was read, 0 if it could not be read or does not exist.
323 static int read_oneliner(struct strbuf *buf,
324 const char *path, int skip_if_empty)
326 int orig_len = buf->len;
328 if (!file_exists(path))
329 return 0;
331 if (strbuf_read_file(buf, path, 0) < 0) {
332 warning_errno(_("could not read '%s'"), path);
333 return 0;
336 if (buf->len > orig_len && buf->buf[buf->len - 1] == '\n') {
337 if (--buf->len > orig_len && buf->buf[buf->len - 1] == '\r')
338 --buf->len;
339 buf->buf[buf->len] = '\0';
342 if (skip_if_empty && buf->len == orig_len)
343 return 0;
345 return 1;
348 static struct tree *empty_tree(void)
350 return lookup_tree(&empty_tree_oid);
353 static int error_dirty_index(struct replay_opts *opts)
355 if (read_cache_unmerged())
356 return error_resolve_conflict(_(action_name(opts)));
358 error(_("your local changes would be overwritten by %s."),
359 _(action_name(opts)));
361 if (advice_commit_before_merge)
362 advise(_("commit your changes or stash them to proceed."));
363 return -1;
366 static void update_abort_safety_file(void)
368 struct object_id head;
370 /* Do nothing on a single-pick */
371 if (!file_exists(git_path_seq_dir()))
372 return;
374 if (!get_oid("HEAD", &head))
375 write_file(git_path_abort_safety_file(), "%s", oid_to_hex(&head));
376 else
377 write_file(git_path_abort_safety_file(), "%s", "");
380 static int fast_forward_to(const struct object_id *to, const struct object_id *from,
381 int unborn, struct replay_opts *opts)
383 struct ref_transaction *transaction;
384 struct strbuf sb = STRBUF_INIT;
385 struct strbuf err = STRBUF_INIT;
387 read_cache();
388 if (checkout_fast_forward(from, to, 1))
389 return -1; /* the callee should have complained already */
391 strbuf_addf(&sb, _("%s: fast-forward"), _(action_name(opts)));
393 transaction = ref_transaction_begin(&err);
394 if (!transaction ||
395 ref_transaction_update(transaction, "HEAD",
396 to->hash, unborn ? null_sha1 : from->hash,
397 0, sb.buf, &err) ||
398 ref_transaction_commit(transaction, &err)) {
399 ref_transaction_free(transaction);
400 error("%s", err.buf);
401 strbuf_release(&sb);
402 strbuf_release(&err);
403 return -1;
406 strbuf_release(&sb);
407 strbuf_release(&err);
408 ref_transaction_free(transaction);
409 update_abort_safety_file();
410 return 0;
413 void append_conflicts_hint(struct strbuf *msgbuf)
415 int i;
417 strbuf_addch(msgbuf, '\n');
418 strbuf_commented_addf(msgbuf, "Conflicts:\n");
419 for (i = 0; i < active_nr;) {
420 const struct cache_entry *ce = active_cache[i++];
421 if (ce_stage(ce)) {
422 strbuf_commented_addf(msgbuf, "\t%s\n", ce->name);
423 while (i < active_nr && !strcmp(ce->name,
424 active_cache[i]->name))
425 i++;
430 static int do_recursive_merge(struct commit *base, struct commit *next,
431 const char *base_label, const char *next_label,
432 struct object_id *head, struct strbuf *msgbuf,
433 struct replay_opts *opts)
435 struct merge_options o;
436 struct tree *result, *next_tree, *base_tree, *head_tree;
437 int clean;
438 char **xopt;
439 static struct lock_file index_lock;
441 hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR);
443 read_cache();
445 init_merge_options(&o);
446 o.ancestor = base ? base_label : "(empty tree)";
447 o.branch1 = "HEAD";
448 o.branch2 = next ? next_label : "(empty tree)";
449 if (is_rebase_i(opts))
450 o.buffer_output = 2;
452 head_tree = parse_tree_indirect(head);
453 next_tree = next ? next->tree : empty_tree();
454 base_tree = base ? base->tree : empty_tree();
456 for (xopt = opts->xopts; xopt != opts->xopts + opts->xopts_nr; xopt++)
457 parse_merge_opt(&o, *xopt);
459 clean = merge_trees(&o,
460 head_tree,
461 next_tree, base_tree, &result);
462 if (is_rebase_i(opts) && clean <= 0)
463 fputs(o.obuf.buf, stdout);
464 strbuf_release(&o.obuf);
465 if (clean < 0)
466 return clean;
468 if (active_cache_changed &&
469 write_locked_index(&the_index, &index_lock, COMMIT_LOCK))
471 * TRANSLATORS: %s will be "revert", "cherry-pick" or
472 * "rebase -i".
474 return error(_("%s: Unable to write new index file"),
475 _(action_name(opts)));
476 rollback_lock_file(&index_lock);
478 if (opts->signoff)
479 append_signoff(msgbuf, 0, 0);
481 if (!clean)
482 append_conflicts_hint(msgbuf);
484 return !clean;
487 static int is_index_unchanged(void)
489 struct object_id head_oid;
490 struct commit *head_commit;
492 if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, head_oid.hash, NULL))
493 return error(_("could not resolve HEAD commit\n"));
495 head_commit = lookup_commit(&head_oid);
498 * If head_commit is NULL, check_commit, called from
499 * lookup_commit, would have indicated that head_commit is not
500 * a commit object already. parse_commit() will return failure
501 * without further complaints in such a case. Otherwise, if
502 * the commit is invalid, parse_commit() will complain. So
503 * there is nothing for us to say here. Just return failure.
505 if (parse_commit(head_commit))
506 return -1;
508 if (!active_cache_tree)
509 active_cache_tree = cache_tree();
511 if (!cache_tree_fully_valid(active_cache_tree))
512 if (cache_tree_update(&the_index, 0))
513 return error(_("unable to update cache tree\n"));
515 return !oidcmp(&active_cache_tree->oid,
516 &head_commit->tree->object.oid);
519 static int write_author_script(const char *message)
521 struct strbuf buf = STRBUF_INIT;
522 const char *eol;
523 int res;
525 for (;;)
526 if (!*message || starts_with(message, "\n")) {
527 missing_author:
528 /* Missing 'author' line? */
529 unlink(rebase_path_author_script());
530 return 0;
531 } else if (skip_prefix(message, "author ", &message))
532 break;
533 else if ((eol = strchr(message, '\n')))
534 message = eol + 1;
535 else
536 goto missing_author;
538 strbuf_addstr(&buf, "GIT_AUTHOR_NAME='");
539 while (*message && *message != '\n' && *message != '\r')
540 if (skip_prefix(message, " <", &message))
541 break;
542 else if (*message != '\'')
543 strbuf_addch(&buf, *(message++));
544 else
545 strbuf_addf(&buf, "'\\\\%c'", *(message++));
546 strbuf_addstr(&buf, "'\nGIT_AUTHOR_EMAIL='");
547 while (*message && *message != '\n' && *message != '\r')
548 if (skip_prefix(message, "> ", &message))
549 break;
550 else if (*message != '\'')
551 strbuf_addch(&buf, *(message++));
552 else
553 strbuf_addf(&buf, "'\\\\%c'", *(message++));
554 strbuf_addstr(&buf, "'\nGIT_AUTHOR_DATE='@");
555 while (*message && *message != '\n' && *message != '\r')
556 if (*message != '\'')
557 strbuf_addch(&buf, *(message++));
558 else
559 strbuf_addf(&buf, "'\\\\%c'", *(message++));
560 res = write_message(buf.buf, buf.len, rebase_path_author_script(), 1);
561 strbuf_release(&buf);
562 return res;
566 * Read a list of environment variable assignments (such as the author-script
567 * file) into an environment block. Returns -1 on error, 0 otherwise.
569 static int read_env_script(struct argv_array *env)
571 struct strbuf script = STRBUF_INIT;
572 int i, count = 0;
573 char *p, *p2;
575 if (strbuf_read_file(&script, rebase_path_author_script(), 256) <= 0)
576 return -1;
578 for (p = script.buf; *p; p++)
579 if (skip_prefix(p, "'\\\\''", (const char **)&p2))
580 strbuf_splice(&script, p - script.buf, p2 - p, "'", 1);
581 else if (*p == '\'')
582 strbuf_splice(&script, p-- - script.buf, 1, "", 0);
583 else if (*p == '\n') {
584 *p = '\0';
585 count++;
588 for (i = 0, p = script.buf; i < count; i++) {
589 argv_array_push(env, p);
590 p += strlen(p) + 1;
593 return 0;
596 static const char staged_changes_advice[] =
597 N_("you have staged changes in your working tree\n"
598 "If these changes are meant to be squashed into the previous commit, run:\n"
599 "\n"
600 " git commit --amend %s\n"
601 "\n"
602 "If they are meant to go into a new commit, run:\n"
603 "\n"
604 " git commit %s\n"
605 "\n"
606 "In both cases, once you're done, continue with:\n"
607 "\n"
608 " git rebase --continue\n");
610 #define ALLOW_EMPTY (1<<0)
611 #define EDIT_MSG (1<<1)
612 #define AMEND_MSG (1<<2)
613 #define CLEANUP_MSG (1<<3)
614 #define VERIFY_MSG (1<<4)
617 * If we are cherry-pick, and if the merge did not result in
618 * hand-editing, we will hit this commit and inherit the original
619 * author date and name.
621 * If we are revert, or if our cherry-pick results in a hand merge,
622 * we had better say that the current user is responsible for that.
624 * An exception is when run_git_commit() is called during an
625 * interactive rebase: in that case, we will want to retain the
626 * author metadata.
628 static int run_git_commit(const char *defmsg, struct replay_opts *opts,
629 unsigned int flags)
631 struct child_process cmd = CHILD_PROCESS_INIT;
632 const char *value;
634 cmd.git_cmd = 1;
636 if (is_rebase_i(opts)) {
637 if (!(flags & EDIT_MSG)) {
638 cmd.stdout_to_stderr = 1;
639 cmd.err = -1;
642 if (read_env_script(&cmd.env_array)) {
643 const char *gpg_opt = gpg_sign_opt_quoted(opts);
645 return error(_(staged_changes_advice),
646 gpg_opt, gpg_opt);
650 argv_array_push(&cmd.args, "commit");
652 if (!(flags & VERIFY_MSG))
653 argv_array_push(&cmd.args, "-n");
654 if ((flags & AMEND_MSG))
655 argv_array_push(&cmd.args, "--amend");
656 if (opts->gpg_sign)
657 argv_array_pushf(&cmd.args, "-S%s", opts->gpg_sign);
658 if (opts->signoff)
659 argv_array_push(&cmd.args, "-s");
660 if (defmsg)
661 argv_array_pushl(&cmd.args, "-F", defmsg, NULL);
662 if ((flags & CLEANUP_MSG))
663 argv_array_push(&cmd.args, "--cleanup=strip");
664 if ((flags & EDIT_MSG))
665 argv_array_push(&cmd.args, "-e");
666 else if (!(flags & CLEANUP_MSG) &&
667 !opts->signoff && !opts->record_origin &&
668 git_config_get_value("commit.cleanup", &value))
669 argv_array_push(&cmd.args, "--cleanup=verbatim");
671 if ((flags & ALLOW_EMPTY))
672 argv_array_push(&cmd.args, "--allow-empty");
674 if (opts->allow_empty_message)
675 argv_array_push(&cmd.args, "--allow-empty-message");
677 if (cmd.err == -1) {
678 /* hide stderr on success */
679 struct strbuf buf = STRBUF_INIT;
680 int rc = pipe_command(&cmd,
681 NULL, 0,
682 /* stdout is already redirected */
683 NULL, 0,
684 &buf, 0);
685 if (rc)
686 fputs(buf.buf, stderr);
687 strbuf_release(&buf);
688 return rc;
691 return run_command(&cmd);
694 static int is_original_commit_empty(struct commit *commit)
696 const struct object_id *ptree_oid;
698 if (parse_commit(commit))
699 return error(_("could not parse commit %s\n"),
700 oid_to_hex(&commit->object.oid));
701 if (commit->parents) {
702 struct commit *parent = commit->parents->item;
703 if (parse_commit(parent))
704 return error(_("could not parse parent commit %s\n"),
705 oid_to_hex(&parent->object.oid));
706 ptree_oid = &parent->tree->object.oid;
707 } else {
708 ptree_oid = &empty_tree_oid; /* commit is root */
711 return !oidcmp(ptree_oid, &commit->tree->object.oid);
715 * Do we run "git commit" with "--allow-empty"?
717 static int allow_empty(struct replay_opts *opts, struct commit *commit)
719 int index_unchanged, empty_commit;
722 * Three cases:
724 * (1) we do not allow empty at all and error out.
726 * (2) we allow ones that were initially empty, but
727 * forbid the ones that become empty;
729 * (3) we allow both.
731 if (!opts->allow_empty)
732 return 0; /* let "git commit" barf as necessary */
734 index_unchanged = is_index_unchanged();
735 if (index_unchanged < 0)
736 return index_unchanged;
737 if (!index_unchanged)
738 return 0; /* we do not have to say --allow-empty */
740 if (opts->keep_redundant_commits)
741 return 1;
743 empty_commit = is_original_commit_empty(commit);
744 if (empty_commit < 0)
745 return empty_commit;
746 if (!empty_commit)
747 return 0;
748 else
749 return 1;
753 * Note that ordering matters in this enum. Not only must it match the mapping
754 * below, it is also divided into several sections that matter. When adding
755 * new commands, make sure you add it in the right section.
757 enum todo_command {
758 /* commands that handle commits */
759 TODO_PICK = 0,
760 TODO_REVERT,
761 TODO_EDIT,
762 TODO_REWORD,
763 TODO_FIXUP,
764 TODO_SQUASH,
765 /* commands that do something else than handling a single commit */
766 TODO_EXEC,
767 /* commands that do nothing but are counted for reporting progress */
768 TODO_NOOP,
769 TODO_DROP,
770 /* comments (not counted for reporting progress) */
771 TODO_COMMENT
774 static struct {
775 char c;
776 const char *str;
777 } todo_command_info[] = {
778 { 'p', "pick" },
779 { 0, "revert" },
780 { 'e', "edit" },
781 { 'r', "reword" },
782 { 'f', "fixup" },
783 { 's', "squash" },
784 { 'x', "exec" },
785 { 0, "noop" },
786 { 'd', "drop" },
787 { 0, NULL }
790 static const char *command_to_string(const enum todo_command command)
792 if (command < TODO_COMMENT)
793 return todo_command_info[command].str;
794 die("Unknown command: %d", command);
797 static int is_noop(const enum todo_command command)
799 return TODO_NOOP <= command;
802 static int is_fixup(enum todo_command command)
804 return command == TODO_FIXUP || command == TODO_SQUASH;
807 static int update_squash_messages(enum todo_command command,
808 struct commit *commit, struct replay_opts *opts)
810 struct strbuf buf = STRBUF_INIT;
811 int count, res;
812 const char *message, *body;
814 if (file_exists(rebase_path_squash_msg())) {
815 struct strbuf header = STRBUF_INIT;
816 char *eol, *p;
818 if (strbuf_read_file(&buf, rebase_path_squash_msg(), 2048) <= 0)
819 return error(_("could not read '%s'"),
820 rebase_path_squash_msg());
822 p = buf.buf + 1;
823 eol = strchrnul(buf.buf, '\n');
824 if (buf.buf[0] != comment_line_char ||
825 (p += strcspn(p, "0123456789\n")) == eol)
826 return error(_("unexpected 1st line of squash message:"
827 "\n\n\t%.*s"),
828 (int)(eol - buf.buf), buf.buf);
829 count = strtol(p, NULL, 10);
831 if (count < 1)
832 return error(_("invalid 1st line of squash message:\n"
833 "\n\t%.*s"),
834 (int)(eol - buf.buf), buf.buf);
836 strbuf_addf(&header, "%c ", comment_line_char);
837 strbuf_addf(&header,
838 _("This is a combination of %d commits."), ++count);
839 strbuf_splice(&buf, 0, eol - buf.buf, header.buf, header.len);
840 strbuf_release(&header);
841 } else {
842 struct object_id head;
843 struct commit *head_commit;
844 const char *head_message, *body;
846 if (get_oid("HEAD", &head))
847 return error(_("need a HEAD to fixup"));
848 if (!(head_commit = lookup_commit_reference(&head)))
849 return error(_("could not read HEAD"));
850 if (!(head_message = get_commit_buffer(head_commit, NULL)))
851 return error(_("could not read HEAD's commit message"));
853 find_commit_subject(head_message, &body);
854 if (write_message(body, strlen(body),
855 rebase_path_fixup_msg(), 0)) {
856 unuse_commit_buffer(head_commit, head_message);
857 return error(_("cannot write '%s'"),
858 rebase_path_fixup_msg());
861 count = 2;
862 strbuf_addf(&buf, "%c ", comment_line_char);
863 strbuf_addf(&buf, _("This is a combination of %d commits."),
864 count);
865 strbuf_addf(&buf, "\n%c ", comment_line_char);
866 strbuf_addstr(&buf, _("This is the 1st commit message:"));
867 strbuf_addstr(&buf, "\n\n");
868 strbuf_addstr(&buf, body);
870 unuse_commit_buffer(head_commit, head_message);
873 if (!(message = get_commit_buffer(commit, NULL)))
874 return error(_("could not read commit message of %s"),
875 oid_to_hex(&commit->object.oid));
876 find_commit_subject(message, &body);
878 if (command == TODO_SQUASH) {
879 unlink(rebase_path_fixup_msg());
880 strbuf_addf(&buf, "\n%c ", comment_line_char);
881 strbuf_addf(&buf, _("This is the commit message #%d:"), count);
882 strbuf_addstr(&buf, "\n\n");
883 strbuf_addstr(&buf, body);
884 } else if (command == TODO_FIXUP) {
885 strbuf_addf(&buf, "\n%c ", comment_line_char);
886 strbuf_addf(&buf, _("The commit message #%d will be skipped:"),
887 count);
888 strbuf_addstr(&buf, "\n\n");
889 strbuf_add_commented_lines(&buf, body, strlen(body));
890 } else
891 return error(_("unknown command: %d"), command);
892 unuse_commit_buffer(commit, message);
894 res = write_message(buf.buf, buf.len, rebase_path_squash_msg(), 0);
895 strbuf_release(&buf);
896 return res;
899 static void flush_rewritten_pending(void) {
900 struct strbuf buf = STRBUF_INIT;
901 struct object_id newoid;
902 FILE *out;
904 if (strbuf_read_file(&buf, rebase_path_rewritten_pending(), (GIT_MAX_HEXSZ + 1) * 2) > 0 &&
905 !get_oid("HEAD", &newoid) &&
906 (out = fopen_or_warn(rebase_path_rewritten_list(), "a"))) {
907 char *bol = buf.buf, *eol;
909 while (*bol) {
910 eol = strchrnul(bol, '\n');
911 fprintf(out, "%.*s %s\n", (int)(eol - bol),
912 bol, oid_to_hex(&newoid));
913 if (!*eol)
914 break;
915 bol = eol + 1;
917 fclose(out);
918 unlink(rebase_path_rewritten_pending());
920 strbuf_release(&buf);
923 static void record_in_rewritten(struct object_id *oid,
924 enum todo_command next_command) {
925 FILE *out = fopen_or_warn(rebase_path_rewritten_pending(), "a");
927 if (!out)
928 return;
930 fprintf(out, "%s\n", oid_to_hex(oid));
931 fclose(out);
933 if (!is_fixup(next_command))
934 flush_rewritten_pending();
937 static int do_pick_commit(enum todo_command command, struct commit *commit,
938 struct replay_opts *opts, int final_fixup)
940 unsigned int flags = opts->edit ? EDIT_MSG : 0;
941 const char *msg_file = opts->edit ? NULL : git_path_merge_msg();
942 struct object_id head;
943 struct commit *base, *next, *parent;
944 const char *base_label, *next_label;
945 struct commit_message msg = { NULL, NULL, NULL, NULL };
946 struct strbuf msgbuf = STRBUF_INIT;
947 int res, unborn = 0, allow;
949 if (opts->no_commit) {
951 * We do not intend to commit immediately. We just want to
952 * merge the differences in, so let's compute the tree
953 * that represents the "current" state for merge-recursive
954 * to work on.
956 if (write_cache_as_tree(head.hash, 0, NULL))
957 return error(_("your index file is unmerged."));
958 } else {
959 unborn = get_oid("HEAD", &head);
960 if (unborn)
961 oidcpy(&head, &empty_tree_oid);
962 if (index_differs_from(unborn ? EMPTY_TREE_SHA1_HEX : "HEAD", 0, 0))
963 return error_dirty_index(opts);
965 discard_cache();
967 if (!commit->parents)
968 parent = NULL;
969 else if (commit->parents->next) {
970 /* Reverting or cherry-picking a merge commit */
971 int cnt;
972 struct commit_list *p;
974 if (!opts->mainline)
975 return error(_("commit %s is a merge but no -m option was given."),
976 oid_to_hex(&commit->object.oid));
978 for (cnt = 1, p = commit->parents;
979 cnt != opts->mainline && p;
980 cnt++)
981 p = p->next;
982 if (cnt != opts->mainline || !p)
983 return error(_("commit %s does not have parent %d"),
984 oid_to_hex(&commit->object.oid), opts->mainline);
985 parent = p->item;
986 } else if (0 < opts->mainline)
987 return error(_("mainline was specified but commit %s is not a merge."),
988 oid_to_hex(&commit->object.oid));
989 else
990 parent = commit->parents->item;
992 if (get_message(commit, &msg) != 0)
993 return error(_("cannot get commit message for %s"),
994 oid_to_hex(&commit->object.oid));
996 if (opts->allow_ff && !is_fixup(command) &&
997 ((parent && !oidcmp(&parent->object.oid, &head)) ||
998 (!parent && unborn))) {
999 if (is_rebase_i(opts))
1000 write_author_script(msg.message);
1001 res = fast_forward_to(&commit->object.oid, &head, unborn,
1002 opts);
1003 if (res || command != TODO_REWORD)
1004 goto leave;
1005 flags |= EDIT_MSG | AMEND_MSG;
1006 if (command == TODO_REWORD)
1007 flags |= VERIFY_MSG;
1008 msg_file = NULL;
1009 goto fast_forward_edit;
1011 if (parent && parse_commit(parent) < 0)
1012 /* TRANSLATORS: The first %s will be a "todo" command like
1013 "revert" or "pick", the second %s a SHA1. */
1014 return error(_("%s: cannot parse parent commit %s"),
1015 command_to_string(command),
1016 oid_to_hex(&parent->object.oid));
1019 * "commit" is an existing commit. We would want to apply
1020 * the difference it introduces since its first parent "prev"
1021 * on top of the current HEAD if we are cherry-pick. Or the
1022 * reverse of it if we are revert.
1025 if (command == TODO_REVERT) {
1026 base = commit;
1027 base_label = msg.label;
1028 next = parent;
1029 next_label = msg.parent_label;
1030 strbuf_addstr(&msgbuf, "Revert \"");
1031 strbuf_addstr(&msgbuf, msg.subject);
1032 strbuf_addstr(&msgbuf, "\"\n\nThis reverts commit ");
1033 strbuf_addstr(&msgbuf, oid_to_hex(&commit->object.oid));
1035 if (commit->parents && commit->parents->next) {
1036 strbuf_addstr(&msgbuf, ", reversing\nchanges made to ");
1037 strbuf_addstr(&msgbuf, oid_to_hex(&parent->object.oid));
1039 strbuf_addstr(&msgbuf, ".\n");
1040 } else {
1041 const char *p;
1043 base = parent;
1044 base_label = msg.parent_label;
1045 next = commit;
1046 next_label = msg.label;
1048 /* Append the commit log message to msgbuf. */
1049 if (find_commit_subject(msg.message, &p))
1050 strbuf_addstr(&msgbuf, p);
1052 if (opts->record_origin) {
1053 strbuf_complete_line(&msgbuf);
1054 if (!has_conforming_footer(&msgbuf, NULL, 0))
1055 strbuf_addch(&msgbuf, '\n');
1056 strbuf_addstr(&msgbuf, cherry_picked_prefix);
1057 strbuf_addstr(&msgbuf, oid_to_hex(&commit->object.oid));
1058 strbuf_addstr(&msgbuf, ")\n");
1062 if (command == TODO_REWORD)
1063 flags |= EDIT_MSG | VERIFY_MSG;
1064 else if (is_fixup(command)) {
1065 if (update_squash_messages(command, commit, opts))
1066 return -1;
1067 flags |= AMEND_MSG;
1068 if (!final_fixup)
1069 msg_file = rebase_path_squash_msg();
1070 else if (file_exists(rebase_path_fixup_msg())) {
1071 flags |= CLEANUP_MSG;
1072 msg_file = rebase_path_fixup_msg();
1073 } else {
1074 const char *dest = git_path_squash_msg();
1075 unlink(dest);
1076 if (copy_file(dest, rebase_path_squash_msg(), 0666))
1077 return error(_("could not rename '%s' to '%s'"),
1078 rebase_path_squash_msg(), dest);
1079 unlink(git_path_merge_msg());
1080 msg_file = dest;
1081 flags |= EDIT_MSG;
1085 if (is_rebase_i(opts) && write_author_script(msg.message) < 0)
1086 res = -1;
1087 else if (!opts->strategy || !strcmp(opts->strategy, "recursive") || command == TODO_REVERT) {
1088 res = do_recursive_merge(base, next, base_label, next_label,
1089 &head, &msgbuf, opts);
1090 if (res < 0)
1091 return res;
1092 res |= write_message(msgbuf.buf, msgbuf.len,
1093 git_path_merge_msg(), 0);
1094 } else {
1095 struct commit_list *common = NULL;
1096 struct commit_list *remotes = NULL;
1098 res = write_message(msgbuf.buf, msgbuf.len,
1099 git_path_merge_msg(), 0);
1101 commit_list_insert(base, &common);
1102 commit_list_insert(next, &remotes);
1103 res |= try_merge_command(opts->strategy,
1104 opts->xopts_nr, (const char **)opts->xopts,
1105 common, oid_to_hex(&head), remotes);
1106 free_commit_list(common);
1107 free_commit_list(remotes);
1109 strbuf_release(&msgbuf);
1112 * If the merge was clean or if it failed due to conflict, we write
1113 * CHERRY_PICK_HEAD for the subsequent invocation of commit to use.
1114 * However, if the merge did not even start, then we don't want to
1115 * write it at all.
1117 if (command == TODO_PICK && !opts->no_commit && (res == 0 || res == 1) &&
1118 update_ref(NULL, "CHERRY_PICK_HEAD", commit->object.oid.hash, NULL,
1119 REF_NODEREF, UPDATE_REFS_MSG_ON_ERR))
1120 res = -1;
1121 if (command == TODO_REVERT && ((opts->no_commit && res == 0) || res == 1) &&
1122 update_ref(NULL, "REVERT_HEAD", commit->object.oid.hash, NULL,
1123 REF_NODEREF, UPDATE_REFS_MSG_ON_ERR))
1124 res = -1;
1126 if (res) {
1127 error(command == TODO_REVERT
1128 ? _("could not revert %s... %s")
1129 : _("could not apply %s... %s"),
1130 short_commit_name(commit), msg.subject);
1131 print_advice(res == 1, opts);
1132 rerere(opts->allow_rerere_auto);
1133 goto leave;
1136 allow = allow_empty(opts, commit);
1137 if (allow < 0) {
1138 res = allow;
1139 goto leave;
1140 } else if (allow)
1141 flags |= ALLOW_EMPTY;
1142 if (!opts->no_commit)
1143 fast_forward_edit:
1144 res = run_git_commit(msg_file, opts, flags);
1146 if (!res && final_fixup) {
1147 unlink(rebase_path_fixup_msg());
1148 unlink(rebase_path_squash_msg());
1151 leave:
1152 free_message(commit, &msg);
1153 update_abort_safety_file();
1155 return res;
1158 static int prepare_revs(struct replay_opts *opts)
1161 * picking (but not reverting) ranges (but not individual revisions)
1162 * should be done in reverse
1164 if (opts->action == REPLAY_PICK && !opts->revs->no_walk)
1165 opts->revs->reverse ^= 1;
1167 if (prepare_revision_walk(opts->revs))
1168 return error(_("revision walk setup failed"));
1170 if (!opts->revs->commits)
1171 return error(_("empty commit set passed"));
1172 return 0;
1175 static int read_and_refresh_cache(struct replay_opts *opts)
1177 static struct lock_file index_lock;
1178 int index_fd = hold_locked_index(&index_lock, 0);
1179 if (read_index_preload(&the_index, NULL) < 0) {
1180 rollback_lock_file(&index_lock);
1181 return error(_("git %s: failed to read the index"),
1182 _(action_name(opts)));
1184 refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, NULL, NULL, NULL);
1185 if (the_index.cache_changed && index_fd >= 0) {
1186 if (write_locked_index(&the_index, &index_lock, COMMIT_LOCK)) {
1187 rollback_lock_file(&index_lock);
1188 return error(_("git %s: failed to refresh the index"),
1189 _(action_name(opts)));
1192 rollback_lock_file(&index_lock);
1193 return 0;
1196 struct todo_item {
1197 enum todo_command command;
1198 struct commit *commit;
1199 const char *arg;
1200 int arg_len;
1201 size_t offset_in_buf;
1204 struct todo_list {
1205 struct strbuf buf;
1206 struct todo_item *items;
1207 int nr, alloc, current;
1208 int done_nr, total_nr;
1209 struct stat_data stat;
1212 #define TODO_LIST_INIT { STRBUF_INIT }
1214 static void todo_list_release(struct todo_list *todo_list)
1216 strbuf_release(&todo_list->buf);
1217 FREE_AND_NULL(todo_list->items);
1218 todo_list->nr = todo_list->alloc = 0;
1221 static struct todo_item *append_new_todo(struct todo_list *todo_list)
1223 ALLOC_GROW(todo_list->items, todo_list->nr + 1, todo_list->alloc);
1224 return todo_list->items + todo_list->nr++;
1227 static int parse_insn_line(struct todo_item *item, const char *bol, char *eol)
1229 struct object_id commit_oid;
1230 char *end_of_object_name;
1231 int i, saved, status, padding;
1233 /* left-trim */
1234 bol += strspn(bol, " \t");
1236 if (bol == eol || *bol == '\r' || *bol == comment_line_char) {
1237 item->command = TODO_COMMENT;
1238 item->commit = NULL;
1239 item->arg = bol;
1240 item->arg_len = eol - bol;
1241 return 0;
1244 for (i = 0; i < TODO_COMMENT; i++)
1245 if (skip_prefix(bol, todo_command_info[i].str, &bol)) {
1246 item->command = i;
1247 break;
1248 } else if (bol[1] == ' ' && *bol == todo_command_info[i].c) {
1249 bol++;
1250 item->command = i;
1251 break;
1253 if (i >= TODO_COMMENT)
1254 return -1;
1256 if (item->command == TODO_NOOP) {
1257 item->commit = NULL;
1258 item->arg = bol;
1259 item->arg_len = eol - bol;
1260 return 0;
1263 /* Eat up extra spaces/ tabs before object name */
1264 padding = strspn(bol, " \t");
1265 if (!padding)
1266 return -1;
1267 bol += padding;
1269 if (item->command == TODO_EXEC) {
1270 item->arg = bol;
1271 item->arg_len = (int)(eol - bol);
1272 return 0;
1275 end_of_object_name = (char *) bol + strcspn(bol, " \t\n");
1276 saved = *end_of_object_name;
1277 *end_of_object_name = '\0';
1278 status = get_oid(bol, &commit_oid);
1279 *end_of_object_name = saved;
1281 item->arg = end_of_object_name + strspn(end_of_object_name, " \t");
1282 item->arg_len = (int)(eol - item->arg);
1284 if (status < 0)
1285 return -1;
1287 item->commit = lookup_commit_reference(&commit_oid);
1288 return !item->commit;
1291 static int parse_insn_buffer(char *buf, struct todo_list *todo_list)
1293 struct todo_item *item;
1294 char *p = buf, *next_p;
1295 int i, res = 0, fixup_okay = file_exists(rebase_path_done());
1297 for (i = 1; *p; i++, p = next_p) {
1298 char *eol = strchrnul(p, '\n');
1300 next_p = *eol ? eol + 1 /* skip LF */ : eol;
1302 if (p != eol && eol[-1] == '\r')
1303 eol--; /* strip Carriage Return */
1305 item = append_new_todo(todo_list);
1306 item->offset_in_buf = p - todo_list->buf.buf;
1307 if (parse_insn_line(item, p, eol)) {
1308 res = error(_("invalid line %d: %.*s"),
1309 i, (int)(eol - p), p);
1310 item->command = TODO_NOOP;
1313 if (fixup_okay)
1314 ; /* do nothing */
1315 else if (is_fixup(item->command))
1316 return error(_("cannot '%s' without a previous commit"),
1317 command_to_string(item->command));
1318 else if (!is_noop(item->command))
1319 fixup_okay = 1;
1322 return res;
1325 static int count_commands(struct todo_list *todo_list)
1327 int count = 0, i;
1329 for (i = 0; i < todo_list->nr; i++)
1330 if (todo_list->items[i].command != TODO_COMMENT)
1331 count++;
1333 return count;
1336 static int read_populate_todo(struct todo_list *todo_list,
1337 struct replay_opts *opts)
1339 struct stat st;
1340 const char *todo_file = get_todo_path(opts);
1341 int fd, res;
1343 strbuf_reset(&todo_list->buf);
1344 fd = open(todo_file, O_RDONLY);
1345 if (fd < 0)
1346 return error_errno(_("could not open '%s'"), todo_file);
1347 if (strbuf_read(&todo_list->buf, fd, 0) < 0) {
1348 close(fd);
1349 return error(_("could not read '%s'."), todo_file);
1351 close(fd);
1353 res = stat(todo_file, &st);
1354 if (res)
1355 return error(_("could not stat '%s'"), todo_file);
1356 fill_stat_data(&todo_list->stat, &st);
1358 res = parse_insn_buffer(todo_list->buf.buf, todo_list);
1359 if (res) {
1360 if (is_rebase_i(opts))
1361 return error(_("please fix this using "
1362 "'git rebase --edit-todo'."));
1363 return error(_("unusable instruction sheet: '%s'"), todo_file);
1366 if (!todo_list->nr &&
1367 (!is_rebase_i(opts) || !file_exists(rebase_path_done())))
1368 return error(_("no commits parsed."));
1370 if (!is_rebase_i(opts)) {
1371 enum todo_command valid =
1372 opts->action == REPLAY_PICK ? TODO_PICK : TODO_REVERT;
1373 int i;
1375 for (i = 0; i < todo_list->nr; i++)
1376 if (valid == todo_list->items[i].command)
1377 continue;
1378 else if (valid == TODO_PICK)
1379 return error(_("cannot cherry-pick during a revert."));
1380 else
1381 return error(_("cannot revert during a cherry-pick."));
1384 if (is_rebase_i(opts)) {
1385 struct todo_list done = TODO_LIST_INIT;
1386 FILE *f = fopen_or_warn(rebase_path_msgtotal(), "w");
1388 if (strbuf_read_file(&done.buf, rebase_path_done(), 0) > 0 &&
1389 !parse_insn_buffer(done.buf.buf, &done))
1390 todo_list->done_nr = count_commands(&done);
1391 else
1392 todo_list->done_nr = 0;
1394 todo_list->total_nr = todo_list->done_nr
1395 + count_commands(todo_list);
1396 todo_list_release(&done);
1398 if (f) {
1399 fprintf(f, "%d\n", todo_list->total_nr);
1400 fclose(f);
1404 return 0;
1407 static int git_config_string_dup(char **dest,
1408 const char *var, const char *value)
1410 if (!value)
1411 return config_error_nonbool(var);
1412 free(*dest);
1413 *dest = xstrdup(value);
1414 return 0;
1417 static int populate_opts_cb(const char *key, const char *value, void *data)
1419 struct replay_opts *opts = data;
1420 int error_flag = 1;
1422 if (!value)
1423 error_flag = 0;
1424 else if (!strcmp(key, "options.no-commit"))
1425 opts->no_commit = git_config_bool_or_int(key, value, &error_flag);
1426 else if (!strcmp(key, "options.edit"))
1427 opts->edit = git_config_bool_or_int(key, value, &error_flag);
1428 else if (!strcmp(key, "options.signoff"))
1429 opts->signoff = git_config_bool_or_int(key, value, &error_flag);
1430 else if (!strcmp(key, "options.record-origin"))
1431 opts->record_origin = git_config_bool_or_int(key, value, &error_flag);
1432 else if (!strcmp(key, "options.allow-ff"))
1433 opts->allow_ff = git_config_bool_or_int(key, value, &error_flag);
1434 else if (!strcmp(key, "options.mainline"))
1435 opts->mainline = git_config_int(key, value);
1436 else if (!strcmp(key, "options.strategy"))
1437 git_config_string_dup(&opts->strategy, key, value);
1438 else if (!strcmp(key, "options.gpg-sign"))
1439 git_config_string_dup(&opts->gpg_sign, key, value);
1440 else if (!strcmp(key, "options.strategy-option")) {
1441 ALLOC_GROW(opts->xopts, opts->xopts_nr + 1, opts->xopts_alloc);
1442 opts->xopts[opts->xopts_nr++] = xstrdup(value);
1443 } else if (!strcmp(key, "options.allow-rerere-auto"))
1444 opts->allow_rerere_auto =
1445 git_config_bool_or_int(key, value, &error_flag) ?
1446 RERERE_AUTOUPDATE : RERERE_NOAUTOUPDATE;
1447 else
1448 return error(_("invalid key: %s"), key);
1450 if (!error_flag)
1451 return error(_("invalid value for %s: %s"), key, value);
1453 return 0;
1456 static void read_strategy_opts(struct replay_opts *opts, struct strbuf *buf)
1458 int i;
1460 strbuf_reset(buf);
1461 if (!read_oneliner(buf, rebase_path_strategy(), 0))
1462 return;
1463 opts->strategy = strbuf_detach(buf, NULL);
1464 if (!read_oneliner(buf, rebase_path_strategy_opts(), 0))
1465 return;
1467 opts->xopts_nr = split_cmdline(buf->buf, (const char ***)&opts->xopts);
1468 for (i = 0; i < opts->xopts_nr; i++) {
1469 const char *arg = opts->xopts[i];
1471 skip_prefix(arg, "--", &arg);
1472 opts->xopts[i] = xstrdup(arg);
1476 static int read_populate_opts(struct replay_opts *opts)
1478 if (is_rebase_i(opts)) {
1479 struct strbuf buf = STRBUF_INIT;
1481 if (read_oneliner(&buf, rebase_path_gpg_sign_opt(), 1)) {
1482 if (!starts_with(buf.buf, "-S"))
1483 strbuf_reset(&buf);
1484 else {
1485 free(opts->gpg_sign);
1486 opts->gpg_sign = xstrdup(buf.buf + 2);
1488 strbuf_reset(&buf);
1491 if (read_oneliner(&buf, rebase_path_allow_rerere_autoupdate(), 1)) {
1492 if (!strcmp(buf.buf, "--rerere-autoupdate"))
1493 opts->allow_rerere_auto = RERERE_AUTOUPDATE;
1494 else if (!strcmp(buf.buf, "--no-rerere-autoupdate"))
1495 opts->allow_rerere_auto = RERERE_NOAUTOUPDATE;
1496 strbuf_reset(&buf);
1499 if (file_exists(rebase_path_verbose()))
1500 opts->verbose = 1;
1502 read_strategy_opts(opts, &buf);
1503 strbuf_release(&buf);
1505 return 0;
1508 if (!file_exists(git_path_opts_file()))
1509 return 0;
1511 * The function git_parse_source(), called from git_config_from_file(),
1512 * may die() in case of a syntactically incorrect file. We do not care
1513 * about this case, though, because we wrote that file ourselves, so we
1514 * are pretty certain that it is syntactically correct.
1516 if (git_config_from_file(populate_opts_cb, git_path_opts_file(), opts) < 0)
1517 return error(_("malformed options sheet: '%s'"),
1518 git_path_opts_file());
1519 return 0;
1522 static int walk_revs_populate_todo(struct todo_list *todo_list,
1523 struct replay_opts *opts)
1525 enum todo_command command = opts->action == REPLAY_PICK ?
1526 TODO_PICK : TODO_REVERT;
1527 const char *command_string = todo_command_info[command].str;
1528 struct commit *commit;
1530 if (prepare_revs(opts))
1531 return -1;
1533 while ((commit = get_revision(opts->revs))) {
1534 struct todo_item *item = append_new_todo(todo_list);
1535 const char *commit_buffer = get_commit_buffer(commit, NULL);
1536 const char *subject;
1537 int subject_len;
1539 item->command = command;
1540 item->commit = commit;
1541 item->arg = NULL;
1542 item->arg_len = 0;
1543 item->offset_in_buf = todo_list->buf.len;
1544 subject_len = find_commit_subject(commit_buffer, &subject);
1545 strbuf_addf(&todo_list->buf, "%s %s %.*s\n", command_string,
1546 short_commit_name(commit), subject_len, subject);
1547 unuse_commit_buffer(commit, commit_buffer);
1549 return 0;
1552 static int create_seq_dir(void)
1554 if (file_exists(git_path_seq_dir())) {
1555 error(_("a cherry-pick or revert is already in progress"));
1556 advise(_("try \"git cherry-pick (--continue | --quit | --abort)\""));
1557 return -1;
1558 } else if (mkdir(git_path_seq_dir(), 0777) < 0)
1559 return error_errno(_("could not create sequencer directory '%s'"),
1560 git_path_seq_dir());
1561 return 0;
1564 static int save_head(const char *head)
1566 static struct lock_file head_lock;
1567 struct strbuf buf = STRBUF_INIT;
1568 int fd;
1569 ssize_t written;
1571 fd = hold_lock_file_for_update(&head_lock, git_path_head_file(), 0);
1572 if (fd < 0) {
1573 rollback_lock_file(&head_lock);
1574 return error_errno(_("could not lock HEAD"));
1576 strbuf_addf(&buf, "%s\n", head);
1577 written = write_in_full(fd, buf.buf, buf.len);
1578 strbuf_release(&buf);
1579 if (written < 0) {
1580 rollback_lock_file(&head_lock);
1581 return error_errno(_("could not write to '%s'"),
1582 git_path_head_file());
1584 if (commit_lock_file(&head_lock) < 0) {
1585 rollback_lock_file(&head_lock);
1586 return error(_("failed to finalize '%s'."), git_path_head_file());
1588 return 0;
1591 static int rollback_is_safe(void)
1593 struct strbuf sb = STRBUF_INIT;
1594 struct object_id expected_head, actual_head;
1596 if (strbuf_read_file(&sb, git_path_abort_safety_file(), 0) >= 0) {
1597 strbuf_trim(&sb);
1598 if (get_oid_hex(sb.buf, &expected_head)) {
1599 strbuf_release(&sb);
1600 die(_("could not parse %s"), git_path_abort_safety_file());
1602 strbuf_release(&sb);
1604 else if (errno == ENOENT)
1605 oidclr(&expected_head);
1606 else
1607 die_errno(_("could not read '%s'"), git_path_abort_safety_file());
1609 if (get_oid("HEAD", &actual_head))
1610 oidclr(&actual_head);
1612 return !oidcmp(&actual_head, &expected_head);
1615 static int reset_for_rollback(const struct object_id *oid)
1617 const char *argv[4]; /* reset --merge <arg> + NULL */
1619 argv[0] = "reset";
1620 argv[1] = "--merge";
1621 argv[2] = oid_to_hex(oid);
1622 argv[3] = NULL;
1623 return run_command_v_opt(argv, RUN_GIT_CMD);
1626 static int rollback_single_pick(void)
1628 struct object_id head_oid;
1630 if (!file_exists(git_path_cherry_pick_head()) &&
1631 !file_exists(git_path_revert_head()))
1632 return error(_("no cherry-pick or revert in progress"));
1633 if (read_ref_full("HEAD", 0, head_oid.hash, NULL))
1634 return error(_("cannot resolve HEAD"));
1635 if (is_null_oid(&head_oid))
1636 return error(_("cannot abort from a branch yet to be born"));
1637 return reset_for_rollback(&head_oid);
1640 int sequencer_rollback(struct replay_opts *opts)
1642 FILE *f;
1643 struct object_id oid;
1644 struct strbuf buf = STRBUF_INIT;
1645 const char *p;
1647 f = fopen(git_path_head_file(), "r");
1648 if (!f && errno == ENOENT) {
1650 * There is no multiple-cherry-pick in progress.
1651 * If CHERRY_PICK_HEAD or REVERT_HEAD indicates
1652 * a single-cherry-pick in progress, abort that.
1654 return rollback_single_pick();
1656 if (!f)
1657 return error_errno(_("cannot open '%s'"), git_path_head_file());
1658 if (strbuf_getline_lf(&buf, f)) {
1659 error(_("cannot read '%s': %s"), git_path_head_file(),
1660 ferror(f) ? strerror(errno) : _("unexpected end of file"));
1661 fclose(f);
1662 goto fail;
1664 fclose(f);
1665 if (parse_oid_hex(buf.buf, &oid, &p) || *p != '\0') {
1666 error(_("stored pre-cherry-pick HEAD file '%s' is corrupt"),
1667 git_path_head_file());
1668 goto fail;
1670 if (is_null_oid(&oid)) {
1671 error(_("cannot abort from a branch yet to be born"));
1672 goto fail;
1675 if (!rollback_is_safe()) {
1676 /* Do not error, just do not rollback */
1677 warning(_("You seem to have moved HEAD. "
1678 "Not rewinding, check your HEAD!"));
1679 } else
1680 if (reset_for_rollback(&oid))
1681 goto fail;
1682 strbuf_release(&buf);
1683 return sequencer_remove_state(opts);
1684 fail:
1685 strbuf_release(&buf);
1686 return -1;
1689 static int save_todo(struct todo_list *todo_list, struct replay_opts *opts)
1691 static struct lock_file todo_lock;
1692 const char *todo_path = get_todo_path(opts);
1693 int next = todo_list->current, offset, fd;
1696 * rebase -i writes "git-rebase-todo" without the currently executing
1697 * command, appending it to "done" instead.
1699 if (is_rebase_i(opts))
1700 next++;
1702 fd = hold_lock_file_for_update(&todo_lock, todo_path, 0);
1703 if (fd < 0)
1704 return error_errno(_("could not lock '%s'"), todo_path);
1705 offset = next < todo_list->nr ?
1706 todo_list->items[next].offset_in_buf : todo_list->buf.len;
1707 if (write_in_full(fd, todo_list->buf.buf + offset,
1708 todo_list->buf.len - offset) < 0)
1709 return error_errno(_("could not write to '%s'"), todo_path);
1710 if (commit_lock_file(&todo_lock) < 0)
1711 return error(_("failed to finalize '%s'."), todo_path);
1713 if (is_rebase_i(opts)) {
1714 const char *done_path = rebase_path_done();
1715 int fd = open(done_path, O_CREAT | O_WRONLY | O_APPEND, 0666);
1716 int prev_offset = !next ? 0 :
1717 todo_list->items[next - 1].offset_in_buf;
1719 if (fd >= 0 && offset > prev_offset &&
1720 write_in_full(fd, todo_list->buf.buf + prev_offset,
1721 offset - prev_offset) < 0) {
1722 close(fd);
1723 return error_errno(_("could not write to '%s'"),
1724 done_path);
1726 if (fd >= 0)
1727 close(fd);
1729 return 0;
1732 static int save_opts(struct replay_opts *opts)
1734 const char *opts_file = git_path_opts_file();
1735 int res = 0;
1737 if (opts->no_commit)
1738 res |= git_config_set_in_file_gently(opts_file, "options.no-commit", "true");
1739 if (opts->edit)
1740 res |= git_config_set_in_file_gently(opts_file, "options.edit", "true");
1741 if (opts->signoff)
1742 res |= git_config_set_in_file_gently(opts_file, "options.signoff", "true");
1743 if (opts->record_origin)
1744 res |= git_config_set_in_file_gently(opts_file, "options.record-origin", "true");
1745 if (opts->allow_ff)
1746 res |= git_config_set_in_file_gently(opts_file, "options.allow-ff", "true");
1747 if (opts->mainline) {
1748 struct strbuf buf = STRBUF_INIT;
1749 strbuf_addf(&buf, "%d", opts->mainline);
1750 res |= git_config_set_in_file_gently(opts_file, "options.mainline", buf.buf);
1751 strbuf_release(&buf);
1753 if (opts->strategy)
1754 res |= git_config_set_in_file_gently(opts_file, "options.strategy", opts->strategy);
1755 if (opts->gpg_sign)
1756 res |= git_config_set_in_file_gently(opts_file, "options.gpg-sign", opts->gpg_sign);
1757 if (opts->xopts) {
1758 int i;
1759 for (i = 0; i < opts->xopts_nr; i++)
1760 res |= git_config_set_multivar_in_file_gently(opts_file,
1761 "options.strategy-option",
1762 opts->xopts[i], "^$", 0);
1764 if (opts->allow_rerere_auto)
1765 res |= git_config_set_in_file_gently(opts_file, "options.allow-rerere-auto",
1766 opts->allow_rerere_auto == RERERE_AUTOUPDATE ?
1767 "true" : "false");
1768 return res;
1771 static int make_patch(struct commit *commit, struct replay_opts *opts)
1773 struct strbuf buf = STRBUF_INIT;
1774 struct rev_info log_tree_opt;
1775 const char *subject, *p;
1776 int res = 0;
1778 p = short_commit_name(commit);
1779 if (write_message(p, strlen(p), rebase_path_stopped_sha(), 1) < 0)
1780 return -1;
1782 strbuf_addf(&buf, "%s/patch", get_dir(opts));
1783 memset(&log_tree_opt, 0, sizeof(log_tree_opt));
1784 init_revisions(&log_tree_opt, NULL);
1785 log_tree_opt.abbrev = 0;
1786 log_tree_opt.diff = 1;
1787 log_tree_opt.diffopt.output_format = DIFF_FORMAT_PATCH;
1788 log_tree_opt.disable_stdin = 1;
1789 log_tree_opt.no_commit_id = 1;
1790 log_tree_opt.diffopt.file = fopen(buf.buf, "w");
1791 log_tree_opt.diffopt.use_color = GIT_COLOR_NEVER;
1792 if (!log_tree_opt.diffopt.file)
1793 res |= error_errno(_("could not open '%s'"), buf.buf);
1794 else {
1795 res |= log_tree_commit(&log_tree_opt, commit);
1796 fclose(log_tree_opt.diffopt.file);
1798 strbuf_reset(&buf);
1800 strbuf_addf(&buf, "%s/message", get_dir(opts));
1801 if (!file_exists(buf.buf)) {
1802 const char *commit_buffer = get_commit_buffer(commit, NULL);
1803 find_commit_subject(commit_buffer, &subject);
1804 res |= write_message(subject, strlen(subject), buf.buf, 1);
1805 unuse_commit_buffer(commit, commit_buffer);
1807 strbuf_release(&buf);
1809 return res;
1812 static int intend_to_amend(void)
1814 struct object_id head;
1815 char *p;
1817 if (get_oid("HEAD", &head))
1818 return error(_("cannot read HEAD"));
1820 p = oid_to_hex(&head);
1821 return write_message(p, strlen(p), rebase_path_amend(), 1);
1824 static int error_with_patch(struct commit *commit,
1825 const char *subject, int subject_len,
1826 struct replay_opts *opts, int exit_code, int to_amend)
1828 if (make_patch(commit, opts))
1829 return -1;
1831 if (to_amend) {
1832 if (intend_to_amend())
1833 return -1;
1835 fprintf(stderr, "You can amend the commit now, with\n"
1836 "\n"
1837 " git commit --amend %s\n"
1838 "\n"
1839 "Once you are satisfied with your changes, run\n"
1840 "\n"
1841 " git rebase --continue\n", gpg_sign_opt_quoted(opts));
1842 } else if (exit_code)
1843 fprintf(stderr, "Could not apply %s... %.*s\n",
1844 short_commit_name(commit), subject_len, subject);
1846 return exit_code;
1849 static int error_failed_squash(struct commit *commit,
1850 struct replay_opts *opts, int subject_len, const char *subject)
1852 if (rename(rebase_path_squash_msg(), rebase_path_message()))
1853 return error(_("could not rename '%s' to '%s'"),
1854 rebase_path_squash_msg(), rebase_path_message());
1855 unlink(rebase_path_fixup_msg());
1856 unlink(git_path_merge_msg());
1857 if (copy_file(git_path_merge_msg(), rebase_path_message(), 0666))
1858 return error(_("could not copy '%s' to '%s'"),
1859 rebase_path_message(), git_path_merge_msg());
1860 return error_with_patch(commit, subject, subject_len, opts, 1, 0);
1863 static int do_exec(const char *command_line)
1865 const char *child_argv[] = { NULL, NULL };
1866 int dirty, status;
1868 fprintf(stderr, "Executing: %s\n", command_line);
1869 child_argv[0] = command_line;
1870 status = run_command_v_opt(child_argv, RUN_USING_SHELL);
1872 /* force re-reading of the cache */
1873 if (discard_cache() < 0 || read_cache() < 0)
1874 return error(_("could not read index"));
1876 dirty = require_clean_work_tree("rebase", NULL, 1, 1);
1878 if (status) {
1879 warning(_("execution failed: %s\n%s"
1880 "You can fix the problem, and then run\n"
1881 "\n"
1882 " git rebase --continue\n"
1883 "\n"),
1884 command_line,
1885 dirty ? N_("and made changes to the index and/or the "
1886 "working tree\n") : "");
1887 if (status == 127)
1888 /* command not found */
1889 status = 1;
1890 } else if (dirty) {
1891 warning(_("execution succeeded: %s\nbut "
1892 "left changes to the index and/or the working tree\n"
1893 "Commit or stash your changes, and then run\n"
1894 "\n"
1895 " git rebase --continue\n"
1896 "\n"), command_line);
1897 status = 1;
1900 return status;
1903 static int is_final_fixup(struct todo_list *todo_list)
1905 int i = todo_list->current;
1907 if (!is_fixup(todo_list->items[i].command))
1908 return 0;
1910 while (++i < todo_list->nr)
1911 if (is_fixup(todo_list->items[i].command))
1912 return 0;
1913 else if (!is_noop(todo_list->items[i].command))
1914 break;
1915 return 1;
1918 static enum todo_command peek_command(struct todo_list *todo_list, int offset)
1920 int i;
1922 for (i = todo_list->current + offset; i < todo_list->nr; i++)
1923 if (!is_noop(todo_list->items[i].command))
1924 return todo_list->items[i].command;
1926 return -1;
1929 static int apply_autostash(struct replay_opts *opts)
1931 struct strbuf stash_sha1 = STRBUF_INIT;
1932 struct child_process child = CHILD_PROCESS_INIT;
1933 int ret = 0;
1935 if (!read_oneliner(&stash_sha1, rebase_path_autostash(), 1)) {
1936 strbuf_release(&stash_sha1);
1937 return 0;
1939 strbuf_trim(&stash_sha1);
1941 child.git_cmd = 1;
1942 child.no_stdout = 1;
1943 child.no_stderr = 1;
1944 argv_array_push(&child.args, "stash");
1945 argv_array_push(&child.args, "apply");
1946 argv_array_push(&child.args, stash_sha1.buf);
1947 if (!run_command(&child))
1948 fprintf(stderr, _("Applied autostash.\n"));
1949 else {
1950 struct child_process store = CHILD_PROCESS_INIT;
1952 store.git_cmd = 1;
1953 argv_array_push(&store.args, "stash");
1954 argv_array_push(&store.args, "store");
1955 argv_array_push(&store.args, "-m");
1956 argv_array_push(&store.args, "autostash");
1957 argv_array_push(&store.args, "-q");
1958 argv_array_push(&store.args, stash_sha1.buf);
1959 if (run_command(&store))
1960 ret = error(_("cannot store %s"), stash_sha1.buf);
1961 else
1962 fprintf(stderr,
1963 _("Applying autostash resulted in conflicts.\n"
1964 "Your changes are safe in the stash.\n"
1965 "You can run \"git stash pop\" or"
1966 " \"git stash drop\" at any time.\n"));
1969 strbuf_release(&stash_sha1);
1970 return ret;
1973 static const char *reflog_message(struct replay_opts *opts,
1974 const char *sub_action, const char *fmt, ...)
1976 va_list ap;
1977 static struct strbuf buf = STRBUF_INIT;
1979 va_start(ap, fmt);
1980 strbuf_reset(&buf);
1981 strbuf_addstr(&buf, action_name(opts));
1982 if (sub_action)
1983 strbuf_addf(&buf, " (%s)", sub_action);
1984 if (fmt) {
1985 strbuf_addstr(&buf, ": ");
1986 strbuf_vaddf(&buf, fmt, ap);
1988 va_end(ap);
1990 return buf.buf;
1993 static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
1995 int res = 0;
1997 setenv(GIT_REFLOG_ACTION, action_name(opts), 0);
1998 if (opts->allow_ff)
1999 assert(!(opts->signoff || opts->no_commit ||
2000 opts->record_origin || opts->edit));
2001 if (read_and_refresh_cache(opts))
2002 return -1;
2004 while (todo_list->current < todo_list->nr) {
2005 struct todo_item *item = todo_list->items + todo_list->current;
2006 if (save_todo(todo_list, opts))
2007 return -1;
2008 if (is_rebase_i(opts)) {
2009 if (item->command != TODO_COMMENT) {
2010 FILE *f = fopen(rebase_path_msgnum(), "w");
2012 todo_list->done_nr++;
2014 if (f) {
2015 fprintf(f, "%d\n", todo_list->done_nr);
2016 fclose(f);
2018 fprintf(stderr, "Rebasing (%d/%d)%s",
2019 todo_list->done_nr,
2020 todo_list->total_nr,
2021 opts->verbose ? "\n" : "\r");
2023 unlink(rebase_path_message());
2024 unlink(rebase_path_author_script());
2025 unlink(rebase_path_stopped_sha());
2026 unlink(rebase_path_amend());
2028 if (item->command <= TODO_SQUASH) {
2029 if (is_rebase_i(opts))
2030 setenv("GIT_REFLOG_ACTION", reflog_message(opts,
2031 command_to_string(item->command), NULL),
2033 res = do_pick_commit(item->command, item->commit,
2034 opts, is_final_fixup(todo_list));
2035 if (is_rebase_i(opts) && res < 0) {
2036 /* Reschedule */
2037 todo_list->current--;
2038 if (save_todo(todo_list, opts))
2039 return -1;
2041 if (item->command == TODO_EDIT) {
2042 struct commit *commit = item->commit;
2043 if (!res)
2044 fprintf(stderr,
2045 _("Stopped at %s... %.*s\n"),
2046 short_commit_name(commit),
2047 item->arg_len, item->arg);
2048 return error_with_patch(commit,
2049 item->arg, item->arg_len, opts, res,
2050 !res);
2052 if (is_rebase_i(opts) && !res)
2053 record_in_rewritten(&item->commit->object.oid,
2054 peek_command(todo_list, 1));
2055 if (res && is_fixup(item->command)) {
2056 if (res == 1)
2057 intend_to_amend();
2058 return error_failed_squash(item->commit, opts,
2059 item->arg_len, item->arg);
2060 } else if (res && is_rebase_i(opts))
2061 return res | error_with_patch(item->commit,
2062 item->arg, item->arg_len, opts, res,
2063 item->command == TODO_REWORD);
2064 } else if (item->command == TODO_EXEC) {
2065 char *end_of_arg = (char *)(item->arg + item->arg_len);
2066 int saved = *end_of_arg;
2067 struct stat st;
2069 *end_of_arg = '\0';
2070 res = do_exec(item->arg);
2071 *end_of_arg = saved;
2073 /* Reread the todo file if it has changed. */
2074 if (res)
2075 ; /* fall through */
2076 else if (stat(get_todo_path(opts), &st))
2077 res = error_errno(_("could not stat '%s'"),
2078 get_todo_path(opts));
2079 else if (match_stat_data(&todo_list->stat, &st)) {
2080 todo_list_release(todo_list);
2081 if (read_populate_todo(todo_list, opts))
2082 res = -1; /* message was printed */
2083 /* `current` will be incremented below */
2084 todo_list->current = -1;
2086 } else if (!is_noop(item->command))
2087 return error(_("unknown command %d"), item->command);
2089 todo_list->current++;
2090 if (res)
2091 return res;
2094 if (is_rebase_i(opts)) {
2095 struct strbuf head_ref = STRBUF_INIT, buf = STRBUF_INIT;
2096 struct stat st;
2098 /* Stopped in the middle, as planned? */
2099 if (todo_list->current < todo_list->nr)
2100 return 0;
2102 if (read_oneliner(&head_ref, rebase_path_head_name(), 0) &&
2103 starts_with(head_ref.buf, "refs/")) {
2104 const char *msg;
2105 struct object_id head, orig;
2106 int res;
2108 if (get_oid("HEAD", &head)) {
2109 res = error(_("cannot read HEAD"));
2110 cleanup_head_ref:
2111 strbuf_release(&head_ref);
2112 strbuf_release(&buf);
2113 return res;
2115 if (!read_oneliner(&buf, rebase_path_orig_head(), 0) ||
2116 get_oid_hex(buf.buf, &orig)) {
2117 res = error(_("could not read orig-head"));
2118 goto cleanup_head_ref;
2120 strbuf_reset(&buf);
2121 if (!read_oneliner(&buf, rebase_path_onto(), 0)) {
2122 res = error(_("could not read 'onto'"));
2123 goto cleanup_head_ref;
2125 msg = reflog_message(opts, "finish", "%s onto %s",
2126 head_ref.buf, buf.buf);
2127 if (update_ref(msg, head_ref.buf, head.hash, orig.hash,
2128 REF_NODEREF, UPDATE_REFS_MSG_ON_ERR)) {
2129 res = error(_("could not update %s"),
2130 head_ref.buf);
2131 goto cleanup_head_ref;
2133 msg = reflog_message(opts, "finish", "returning to %s",
2134 head_ref.buf);
2135 if (create_symref("HEAD", head_ref.buf, msg)) {
2136 res = error(_("could not update HEAD to %s"),
2137 head_ref.buf);
2138 goto cleanup_head_ref;
2140 strbuf_reset(&buf);
2143 if (opts->verbose) {
2144 struct rev_info log_tree_opt;
2145 struct object_id orig, head;
2147 memset(&log_tree_opt, 0, sizeof(log_tree_opt));
2148 init_revisions(&log_tree_opt, NULL);
2149 log_tree_opt.diff = 1;
2150 log_tree_opt.diffopt.output_format =
2151 DIFF_FORMAT_DIFFSTAT;
2152 log_tree_opt.disable_stdin = 1;
2154 if (read_oneliner(&buf, rebase_path_orig_head(), 0) &&
2155 !get_oid(buf.buf, &orig) &&
2156 !get_oid("HEAD", &head)) {
2157 diff_tree_oid(&orig, &head, "",
2158 &log_tree_opt.diffopt);
2159 log_tree_diff_flush(&log_tree_opt);
2162 flush_rewritten_pending();
2163 if (!stat(rebase_path_rewritten_list(), &st) &&
2164 st.st_size > 0) {
2165 struct child_process child = CHILD_PROCESS_INIT;
2166 const char *post_rewrite_hook =
2167 find_hook("post-rewrite");
2169 child.in = open(rebase_path_rewritten_list(), O_RDONLY);
2170 child.git_cmd = 1;
2171 argv_array_push(&child.args, "notes");
2172 argv_array_push(&child.args, "copy");
2173 argv_array_push(&child.args, "--for-rewrite=rebase");
2174 /* we don't care if this copying failed */
2175 run_command(&child);
2177 if (post_rewrite_hook) {
2178 struct child_process hook = CHILD_PROCESS_INIT;
2180 hook.in = open(rebase_path_rewritten_list(),
2181 O_RDONLY);
2182 hook.stdout_to_stderr = 1;
2183 argv_array_push(&hook.args, post_rewrite_hook);
2184 argv_array_push(&hook.args, "rebase");
2185 /* we don't care if this hook failed */
2186 run_command(&hook);
2189 apply_autostash(opts);
2191 fprintf(stderr, "Successfully rebased and updated %s.\n",
2192 head_ref.buf);
2194 strbuf_release(&buf);
2195 strbuf_release(&head_ref);
2199 * Sequence of picks finished successfully; cleanup by
2200 * removing the .git/sequencer directory
2202 return sequencer_remove_state(opts);
2205 static int continue_single_pick(void)
2207 const char *argv[] = { "commit", NULL };
2209 if (!file_exists(git_path_cherry_pick_head()) &&
2210 !file_exists(git_path_revert_head()))
2211 return error(_("no cherry-pick or revert in progress"));
2212 return run_command_v_opt(argv, RUN_GIT_CMD);
2215 static int commit_staged_changes(struct replay_opts *opts)
2217 unsigned int flags = ALLOW_EMPTY | EDIT_MSG;
2219 if (has_unstaged_changes(1))
2220 return error(_("cannot rebase: You have unstaged changes."));
2221 if (!has_uncommitted_changes(0)) {
2222 const char *cherry_pick_head = git_path_cherry_pick_head();
2224 if (file_exists(cherry_pick_head) && unlink(cherry_pick_head))
2225 return error(_("could not remove CHERRY_PICK_HEAD"));
2226 return 0;
2229 if (file_exists(rebase_path_amend())) {
2230 struct strbuf rev = STRBUF_INIT;
2231 struct object_id head, to_amend;
2233 if (get_oid("HEAD", &head))
2234 return error(_("cannot amend non-existing commit"));
2235 if (!read_oneliner(&rev, rebase_path_amend(), 0))
2236 return error(_("invalid file: '%s'"), rebase_path_amend());
2237 if (get_oid_hex(rev.buf, &to_amend))
2238 return error(_("invalid contents: '%s'"),
2239 rebase_path_amend());
2240 if (oidcmp(&head, &to_amend))
2241 return error(_("\nYou have uncommitted changes in your "
2242 "working tree. Please, commit them\n"
2243 "first and then run 'git rebase "
2244 "--continue' again."));
2246 strbuf_release(&rev);
2247 flags |= AMEND_MSG;
2250 if (run_git_commit(rebase_path_message(), opts, flags))
2251 return error(_("could not commit staged changes."));
2252 unlink(rebase_path_amend());
2253 return 0;
2256 int sequencer_continue(struct replay_opts *opts)
2258 struct todo_list todo_list = TODO_LIST_INIT;
2259 int res;
2261 if (read_and_refresh_cache(opts))
2262 return -1;
2264 if (is_rebase_i(opts)) {
2265 if (commit_staged_changes(opts))
2266 return -1;
2267 } else if (!file_exists(get_todo_path(opts)))
2268 return continue_single_pick();
2269 if (read_populate_opts(opts))
2270 return -1;
2271 if ((res = read_populate_todo(&todo_list, opts)))
2272 goto release_todo_list;
2274 if (!is_rebase_i(opts)) {
2275 /* Verify that the conflict has been resolved */
2276 if (file_exists(git_path_cherry_pick_head()) ||
2277 file_exists(git_path_revert_head())) {
2278 res = continue_single_pick();
2279 if (res)
2280 goto release_todo_list;
2282 if (index_differs_from("HEAD", 0, 0)) {
2283 res = error_dirty_index(opts);
2284 goto release_todo_list;
2286 todo_list.current++;
2287 } else if (file_exists(rebase_path_stopped_sha())) {
2288 struct strbuf buf = STRBUF_INIT;
2289 struct object_id oid;
2291 if (read_oneliner(&buf, rebase_path_stopped_sha(), 1) &&
2292 !get_oid_committish(buf.buf, &oid))
2293 record_in_rewritten(&oid, peek_command(&todo_list, 0));
2294 strbuf_release(&buf);
2297 res = pick_commits(&todo_list, opts);
2298 release_todo_list:
2299 todo_list_release(&todo_list);
2300 return res;
2303 static int single_pick(struct commit *cmit, struct replay_opts *opts)
2305 setenv(GIT_REFLOG_ACTION, action_name(opts), 0);
2306 return do_pick_commit(opts->action == REPLAY_PICK ?
2307 TODO_PICK : TODO_REVERT, cmit, opts, 0);
2310 int sequencer_pick_revisions(struct replay_opts *opts)
2312 struct todo_list todo_list = TODO_LIST_INIT;
2313 struct object_id oid;
2314 int i, res;
2316 assert(opts->revs);
2317 if (read_and_refresh_cache(opts))
2318 return -1;
2320 for (i = 0; i < opts->revs->pending.nr; i++) {
2321 struct object_id oid;
2322 const char *name = opts->revs->pending.objects[i].name;
2324 /* This happens when using --stdin. */
2325 if (!strlen(name))
2326 continue;
2328 if (!get_oid(name, &oid)) {
2329 if (!lookup_commit_reference_gently(&oid, 1)) {
2330 enum object_type type = sha1_object_info(oid.hash, NULL);
2331 return error(_("%s: can't cherry-pick a %s"),
2332 name, typename(type));
2334 } else
2335 return error(_("%s: bad revision"), name);
2339 * If we were called as "git cherry-pick <commit>", just
2340 * cherry-pick/revert it, set CHERRY_PICK_HEAD /
2341 * REVERT_HEAD, and don't touch the sequencer state.
2342 * This means it is possible to cherry-pick in the middle
2343 * of a cherry-pick sequence.
2345 if (opts->revs->cmdline.nr == 1 &&
2346 opts->revs->cmdline.rev->whence == REV_CMD_REV &&
2347 opts->revs->no_walk &&
2348 !opts->revs->cmdline.rev->flags) {
2349 struct commit *cmit;
2350 if (prepare_revision_walk(opts->revs))
2351 return error(_("revision walk setup failed"));
2352 cmit = get_revision(opts->revs);
2353 if (!cmit || get_revision(opts->revs))
2354 return error("BUG: expected exactly one commit from walk");
2355 return single_pick(cmit, opts);
2359 * Start a new cherry-pick/ revert sequence; but
2360 * first, make sure that an existing one isn't in
2361 * progress
2364 if (walk_revs_populate_todo(&todo_list, opts) ||
2365 create_seq_dir() < 0)
2366 return -1;
2367 if (get_oid("HEAD", &oid) && (opts->action == REPLAY_REVERT))
2368 return error(_("can't revert as initial commit"));
2369 if (save_head(oid_to_hex(&oid)))
2370 return -1;
2371 if (save_opts(opts))
2372 return -1;
2373 update_abort_safety_file();
2374 res = pick_commits(&todo_list, opts);
2375 todo_list_release(&todo_list);
2376 return res;
2379 void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag)
2381 unsigned no_dup_sob = flag & APPEND_SIGNOFF_DEDUP;
2382 struct strbuf sob = STRBUF_INIT;
2383 int has_footer;
2385 strbuf_addstr(&sob, sign_off_header);
2386 strbuf_addstr(&sob, fmt_name(getenv("GIT_COMMITTER_NAME"),
2387 getenv("GIT_COMMITTER_EMAIL")));
2388 strbuf_addch(&sob, '\n');
2390 if (!ignore_footer)
2391 strbuf_complete_line(msgbuf);
2394 * If the whole message buffer is equal to the sob, pretend that we
2395 * found a conforming footer with a matching sob
2397 if (msgbuf->len - ignore_footer == sob.len &&
2398 !strncmp(msgbuf->buf, sob.buf, sob.len))
2399 has_footer = 3;
2400 else
2401 has_footer = has_conforming_footer(msgbuf, &sob, ignore_footer);
2403 if (!has_footer) {
2404 const char *append_newlines = NULL;
2405 size_t len = msgbuf->len - ignore_footer;
2407 if (!len) {
2409 * The buffer is completely empty. Leave foom for
2410 * the title and body to be filled in by the user.
2412 append_newlines = "\n\n";
2413 } else if (len == 1) {
2415 * Buffer contains a single newline. Add another
2416 * so that we leave room for the title and body.
2418 append_newlines = "\n";
2419 } else if (msgbuf->buf[len - 2] != '\n') {
2421 * Buffer ends with a single newline. Add another
2422 * so that there is an empty line between the message
2423 * body and the sob.
2425 append_newlines = "\n";
2426 } /* else, the buffer already ends with two newlines. */
2428 if (append_newlines)
2429 strbuf_splice(msgbuf, msgbuf->len - ignore_footer, 0,
2430 append_newlines, strlen(append_newlines));
2433 if (has_footer != 3 && (!no_dup_sob || has_footer != 2))
2434 strbuf_splice(msgbuf, msgbuf->len - ignore_footer, 0,
2435 sob.buf, sob.len);
2437 strbuf_release(&sob);
2440 int sequencer_make_script(int keep_empty, FILE *out,
2441 int argc, const char **argv)
2443 char *format = NULL;
2444 struct pretty_print_context pp = {0};
2445 struct strbuf buf = STRBUF_INIT;
2446 struct rev_info revs;
2447 struct commit *commit;
2449 init_revisions(&revs, NULL);
2450 revs.verbose_header = 1;
2451 revs.max_parents = 1;
2452 revs.cherry_pick = 1;
2453 revs.limited = 1;
2454 revs.reverse = 1;
2455 revs.right_only = 1;
2456 revs.sort_order = REV_SORT_IN_GRAPH_ORDER;
2457 revs.topo_order = 1;
2459 revs.pretty_given = 1;
2460 git_config_get_string("rebase.instructionFormat", &format);
2461 if (!format || !*format) {
2462 free(format);
2463 format = xstrdup("%s");
2465 get_commit_format(format, &revs);
2466 free(format);
2467 pp.fmt = revs.commit_format;
2468 pp.output_encoding = get_log_output_encoding();
2470 if (setup_revisions(argc, argv, &revs, NULL) > 1)
2471 return error(_("make_script: unhandled options"));
2473 if (prepare_revision_walk(&revs) < 0)
2474 return error(_("make_script: error preparing revisions"));
2476 while ((commit = get_revision(&revs))) {
2477 strbuf_reset(&buf);
2478 if (!keep_empty && is_original_commit_empty(commit))
2479 strbuf_addf(&buf, "%c ", comment_line_char);
2480 strbuf_addf(&buf, "pick %s ", oid_to_hex(&commit->object.oid));
2481 pretty_print_commit(&pp, commit, &buf);
2482 strbuf_addch(&buf, '\n');
2483 fputs(buf.buf, out);
2485 strbuf_release(&buf);
2486 return 0;
2490 int transform_todo_ids(int shorten_ids)
2492 const char *todo_file = rebase_path_todo();
2493 struct todo_list todo_list = TODO_LIST_INIT;
2494 int fd, res, i;
2495 FILE *out;
2497 strbuf_reset(&todo_list.buf);
2498 fd = open(todo_file, O_RDONLY);
2499 if (fd < 0)
2500 return error_errno(_("could not open '%s'"), todo_file);
2501 if (strbuf_read(&todo_list.buf, fd, 0) < 0) {
2502 close(fd);
2503 return error(_("could not read '%s'."), todo_file);
2505 close(fd);
2507 res = parse_insn_buffer(todo_list.buf.buf, &todo_list);
2508 if (res) {
2509 todo_list_release(&todo_list);
2510 return error(_("unusable todo list: '%s'"), todo_file);
2513 out = fopen(todo_file, "w");
2514 if (!out) {
2515 todo_list_release(&todo_list);
2516 return error(_("unable to open '%s' for writing"), todo_file);
2518 for (i = 0; i < todo_list.nr; i++) {
2519 struct todo_item *item = todo_list.items + i;
2520 int bol = item->offset_in_buf;
2521 const char *p = todo_list.buf.buf + bol;
2522 int eol = i + 1 < todo_list.nr ?
2523 todo_list.items[i + 1].offset_in_buf :
2524 todo_list.buf.len;
2526 if (item->command >= TODO_EXEC && item->command != TODO_DROP)
2527 fwrite(p, eol - bol, 1, out);
2528 else {
2529 const char *id = shorten_ids ?
2530 short_commit_name(item->commit) :
2531 oid_to_hex(&item->commit->object.oid);
2532 int len;
2534 p += strspn(p, " \t"); /* left-trim command */
2535 len = strcspn(p, " \t"); /* length of command */
2537 fprintf(out, "%.*s %s %.*s\n",
2538 len, p, id, item->arg_len, item->arg);
2541 fclose(out);
2542 todo_list_release(&todo_list);
2543 return 0;
2546 enum check_level {
2547 CHECK_IGNORE = 0, CHECK_WARN, CHECK_ERROR
2550 static enum check_level get_missing_commit_check_level(void)
2552 const char *value;
2554 if (git_config_get_value("rebase.missingcommitscheck", &value) ||
2555 !strcasecmp("ignore", value))
2556 return CHECK_IGNORE;
2557 if (!strcasecmp("warn", value))
2558 return CHECK_WARN;
2559 if (!strcasecmp("error", value))
2560 return CHECK_ERROR;
2561 warning(_("unrecognized setting %s for option "
2562 "rebase.missingCommitsCheck. Ignoring."), value);
2563 return CHECK_IGNORE;
2567 * Check if the user dropped some commits by mistake
2568 * Behaviour determined by rebase.missingCommitsCheck.
2569 * Check if there is an unrecognized command or a
2570 * bad SHA-1 in a command.
2572 int check_todo_list(void)
2574 enum check_level check_level = get_missing_commit_check_level();
2575 struct strbuf todo_file = STRBUF_INIT;
2576 struct todo_list todo_list = TODO_LIST_INIT;
2577 struct strbuf missing = STRBUF_INIT;
2578 int advise_to_edit_todo = 0, res = 0, fd, i;
2580 strbuf_addstr(&todo_file, rebase_path_todo());
2581 fd = open(todo_file.buf, O_RDONLY);
2582 if (fd < 0) {
2583 res = error_errno(_("could not open '%s'"), todo_file.buf);
2584 goto leave_check;
2586 if (strbuf_read(&todo_list.buf, fd, 0) < 0) {
2587 close(fd);
2588 res = error(_("could not read '%s'."), todo_file.buf);
2589 goto leave_check;
2591 close(fd);
2592 advise_to_edit_todo = res =
2593 parse_insn_buffer(todo_list.buf.buf, &todo_list);
2595 if (res || check_level == CHECK_IGNORE)
2596 goto leave_check;
2598 /* Mark the commits in git-rebase-todo as seen */
2599 for (i = 0; i < todo_list.nr; i++) {
2600 struct commit *commit = todo_list.items[i].commit;
2601 if (commit)
2602 commit->util = (void *)1;
2605 todo_list_release(&todo_list);
2606 strbuf_addstr(&todo_file, ".backup");
2607 fd = open(todo_file.buf, O_RDONLY);
2608 if (fd < 0) {
2609 res = error_errno(_("could not open '%s'"), todo_file.buf);
2610 goto leave_check;
2612 if (strbuf_read(&todo_list.buf, fd, 0) < 0) {
2613 close(fd);
2614 res = error(_("could not read '%s'."), todo_file.buf);
2615 goto leave_check;
2617 close(fd);
2618 strbuf_release(&todo_file);
2619 res = !!parse_insn_buffer(todo_list.buf.buf, &todo_list);
2621 /* Find commits in git-rebase-todo.backup yet unseen */
2622 for (i = todo_list.nr - 1; i >= 0; i--) {
2623 struct todo_item *item = todo_list.items + i;
2624 struct commit *commit = item->commit;
2625 if (commit && !commit->util) {
2626 strbuf_addf(&missing, " - %s %.*s\n",
2627 short_commit_name(commit),
2628 item->arg_len, item->arg);
2629 commit->util = (void *)1;
2633 /* Warn about missing commits */
2634 if (!missing.len)
2635 goto leave_check;
2637 if (check_level == CHECK_ERROR)
2638 advise_to_edit_todo = res = 1;
2640 fprintf(stderr,
2641 _("Warning: some commits may have been dropped accidentally.\n"
2642 "Dropped commits (newer to older):\n"));
2644 /* Make the list user-friendly and display */
2645 fputs(missing.buf, stderr);
2646 strbuf_release(&missing);
2648 fprintf(stderr, _("To avoid this message, use \"drop\" to "
2649 "explicitly remove a commit.\n\n"
2650 "Use 'git config rebase.missingCommitsCheck' to change "
2651 "the level of warnings.\n"
2652 "The possible behaviours are: ignore, warn, error.\n\n"));
2654 leave_check:
2655 strbuf_release(&todo_file);
2656 todo_list_release(&todo_list);
2658 if (advise_to_edit_todo)
2659 fprintf(stderr,
2660 _("You can fix this with 'git rebase --edit-todo' "
2661 "and then run 'git rebase --continue'.\n"
2662 "Or you can abort the rebase with 'git rebase"
2663 " --abort'.\n"));
2665 return res;
2668 /* skip picking commits whose parents are unchanged */
2669 int skip_unnecessary_picks(void)
2671 const char *todo_file = rebase_path_todo();
2672 struct strbuf buf = STRBUF_INIT;
2673 struct todo_list todo_list = TODO_LIST_INIT;
2674 struct object_id onto_oid, *oid = &onto_oid, *parent_oid;
2675 int fd, i;
2677 if (!read_oneliner(&buf, rebase_path_onto(), 0))
2678 return error(_("could not read 'onto'"));
2679 if (get_oid(buf.buf, &onto_oid)) {
2680 strbuf_release(&buf);
2681 return error(_("need a HEAD to fixup"));
2683 strbuf_release(&buf);
2685 fd = open(todo_file, O_RDONLY);
2686 if (fd < 0) {
2687 return error_errno(_("could not open '%s'"), todo_file);
2689 if (strbuf_read(&todo_list.buf, fd, 0) < 0) {
2690 close(fd);
2691 return error(_("could not read '%s'."), todo_file);
2693 close(fd);
2694 if (parse_insn_buffer(todo_list.buf.buf, &todo_list) < 0) {
2695 todo_list_release(&todo_list);
2696 return -1;
2699 for (i = 0; i < todo_list.nr; i++) {
2700 struct todo_item *item = todo_list.items + i;
2702 if (item->command >= TODO_NOOP)
2703 continue;
2704 if (item->command != TODO_PICK)
2705 break;
2706 if (parse_commit(item->commit)) {
2707 todo_list_release(&todo_list);
2708 return error(_("could not parse commit '%s'"),
2709 oid_to_hex(&item->commit->object.oid));
2711 if (!item->commit->parents)
2712 break; /* root commit */
2713 if (item->commit->parents->next)
2714 break; /* merge commit */
2715 parent_oid = &item->commit->parents->item->object.oid;
2716 if (hashcmp(parent_oid->hash, oid->hash))
2717 break;
2718 oid = &item->commit->object.oid;
2720 if (i > 0) {
2721 int offset = i < todo_list.nr ?
2722 todo_list.items[i].offset_in_buf : todo_list.buf.len;
2723 const char *done_path = rebase_path_done();
2725 fd = open(done_path, O_CREAT | O_WRONLY | O_APPEND, 0666);
2726 if (fd < 0) {
2727 error_errno(_("could not open '%s' for writing"),
2728 done_path);
2729 todo_list_release(&todo_list);
2730 return -1;
2732 if (write_in_full(fd, todo_list.buf.buf, offset) < 0) {
2733 error_errno(_("could not write to '%s'"), done_path);
2734 todo_list_release(&todo_list);
2735 close(fd);
2736 return -1;
2738 close(fd);
2740 fd = open(rebase_path_todo(), O_WRONLY, 0666);
2741 if (fd < 0) {
2742 error_errno(_("could not open '%s' for writing"),
2743 rebase_path_todo());
2744 todo_list_release(&todo_list);
2745 return -1;
2747 if (write_in_full(fd, todo_list.buf.buf + offset,
2748 todo_list.buf.len - offset) < 0) {
2749 error_errno(_("could not write to '%s'"),
2750 rebase_path_todo());
2751 close(fd);
2752 todo_list_release(&todo_list);
2753 return -1;
2755 if (ftruncate(fd, todo_list.buf.len - offset) < 0) {
2756 error_errno(_("could not truncate '%s'"),
2757 rebase_path_todo());
2758 todo_list_release(&todo_list);
2759 close(fd);
2760 return -1;
2762 close(fd);
2764 todo_list.current = i;
2765 if (is_fixup(peek_command(&todo_list, 0)))
2766 record_in_rewritten(oid, peek_command(&todo_list, 0));
2769 todo_list_release(&todo_list);
2770 printf("%s\n", oid_to_hex(oid));
2772 return 0;
2775 struct subject2item_entry {
2776 struct hashmap_entry entry;
2777 int i;
2778 char subject[FLEX_ARRAY];
2781 static int subject2item_cmp(const void *fndata,
2782 const struct subject2item_entry *a,
2783 const struct subject2item_entry *b, const void *key)
2785 return key ? strcmp(a->subject, key) : strcmp(a->subject, b->subject);
2789 * Rearrange the todo list that has both "pick commit-id msg" and "pick
2790 * commit-id fixup!/squash! msg" in it so that the latter is put immediately
2791 * after the former, and change "pick" to "fixup"/"squash".
2793 * Note that if the config has specified a custom instruction format, each log
2794 * message will have to be retrieved from the commit (as the oneline in the
2795 * script cannot be trusted) in order to normalize the autosquash arrangement.
2797 int rearrange_squash(void)
2799 const char *todo_file = rebase_path_todo();
2800 struct todo_list todo_list = TODO_LIST_INIT;
2801 struct hashmap subject2item;
2802 int res = 0, rearranged = 0, *next, *tail, fd, i;
2803 char **subjects;
2805 fd = open(todo_file, O_RDONLY);
2806 if (fd < 0)
2807 return error_errno(_("could not open '%s'"), todo_file);
2808 if (strbuf_read(&todo_list.buf, fd, 0) < 0) {
2809 close(fd);
2810 return error(_("could not read '%s'."), todo_file);
2812 close(fd);
2813 if (parse_insn_buffer(todo_list.buf.buf, &todo_list) < 0) {
2814 todo_list_release(&todo_list);
2815 return -1;
2819 * The hashmap maps onelines to the respective todo list index.
2821 * If any items need to be rearranged, the next[i] value will indicate
2822 * which item was moved directly after the i'th.
2824 * In that case, last[i] will indicate the index of the latest item to
2825 * be moved to appear after the i'th.
2827 hashmap_init(&subject2item, (hashmap_cmp_fn) subject2item_cmp,
2828 NULL, todo_list.nr);
2829 ALLOC_ARRAY(next, todo_list.nr);
2830 ALLOC_ARRAY(tail, todo_list.nr);
2831 ALLOC_ARRAY(subjects, todo_list.nr);
2832 for (i = 0; i < todo_list.nr; i++) {
2833 struct strbuf buf = STRBUF_INIT;
2834 struct todo_item *item = todo_list.items + i;
2835 const char *commit_buffer, *subject, *p;
2836 size_t subject_len;
2837 int i2 = -1;
2838 struct subject2item_entry *entry;
2840 next[i] = tail[i] = -1;
2841 if (item->command >= TODO_EXEC) {
2842 subjects[i] = NULL;
2843 continue;
2846 if (is_fixup(item->command)) {
2847 todo_list_release(&todo_list);
2848 return error(_("the script was already rearranged."));
2851 item->commit->util = item;
2853 parse_commit(item->commit);
2854 commit_buffer = get_commit_buffer(item->commit, NULL);
2855 find_commit_subject(commit_buffer, &subject);
2856 format_subject(&buf, subject, " ");
2857 subject = subjects[i] = strbuf_detach(&buf, &subject_len);
2858 unuse_commit_buffer(item->commit, commit_buffer);
2859 if ((skip_prefix(subject, "fixup! ", &p) ||
2860 skip_prefix(subject, "squash! ", &p))) {
2861 struct commit *commit2;
2863 for (;;) {
2864 while (isspace(*p))
2865 p++;
2866 if (!skip_prefix(p, "fixup! ", &p) &&
2867 !skip_prefix(p, "squash! ", &p))
2868 break;
2871 if ((entry = hashmap_get_from_hash(&subject2item,
2872 strhash(p), p)))
2873 /* found by title */
2874 i2 = entry->i;
2875 else if (!strchr(p, ' ') &&
2876 (commit2 =
2877 lookup_commit_reference_by_name(p)) &&
2878 commit2->util)
2879 /* found by commit name */
2880 i2 = (struct todo_item *)commit2->util
2881 - todo_list.items;
2882 else {
2883 /* copy can be a prefix of the commit subject */
2884 for (i2 = 0; i2 < i; i2++)
2885 if (subjects[i2] &&
2886 starts_with(subjects[i2], p))
2887 break;
2888 if (i2 == i)
2889 i2 = -1;
2892 if (i2 >= 0) {
2893 rearranged = 1;
2894 todo_list.items[i].command =
2895 starts_with(subject, "fixup!") ?
2896 TODO_FIXUP : TODO_SQUASH;
2897 if (next[i2] < 0)
2898 next[i2] = i;
2899 else
2900 next[tail[i2]] = i;
2901 tail[i2] = i;
2902 } else if (!hashmap_get_from_hash(&subject2item,
2903 strhash(subject), subject)) {
2904 FLEX_ALLOC_MEM(entry, subject, subject, subject_len);
2905 entry->i = i;
2906 hashmap_entry_init(entry, strhash(entry->subject));
2907 hashmap_put(&subject2item, entry);
2911 if (rearranged) {
2912 struct strbuf buf = STRBUF_INIT;
2914 for (i = 0; i < todo_list.nr; i++) {
2915 enum todo_command command = todo_list.items[i].command;
2916 int cur = i;
2919 * Initially, all commands are 'pick's. If it is a
2920 * fixup or a squash now, we have rearranged it.
2922 if (is_fixup(command))
2923 continue;
2925 while (cur >= 0) {
2926 int offset = todo_list.items[cur].offset_in_buf;
2927 int end_offset = cur + 1 < todo_list.nr ?
2928 todo_list.items[cur + 1].offset_in_buf :
2929 todo_list.buf.len;
2930 char *bol = todo_list.buf.buf + offset;
2931 char *eol = todo_list.buf.buf + end_offset;
2933 /* replace 'pick', by 'fixup' or 'squash' */
2934 command = todo_list.items[cur].command;
2935 if (is_fixup(command)) {
2936 strbuf_addstr(&buf,
2937 todo_command_info[command].str);
2938 bol += strcspn(bol, " \t");
2941 strbuf_add(&buf, bol, eol - bol);
2943 cur = next[cur];
2947 fd = open(todo_file, O_WRONLY);
2948 if (fd < 0)
2949 res = error_errno(_("could not open '%s'"), todo_file);
2950 else if (write(fd, buf.buf, buf.len) < 0)
2951 res = error_errno(_("could not write to '%s'"), todo_file);
2952 else if (ftruncate(fd, buf.len) < 0)
2953 res = error_errno(_("could not truncate '%s'"),
2954 todo_file);
2955 close(fd);
2956 strbuf_release(&buf);
2959 free(next);
2960 free(tail);
2961 for (i = 0; i < todo_list.nr; i++)
2962 free(subjects[i]);
2963 free(subjects);
2964 hashmap_free(&subject2item, 1);
2965 todo_list_release(&todo_list);
2967 return res;