Merge branch 'pw/rebase-i-regression-fix-tests' into maint
[git/git.git] / sequencer.c
1 #include "cache.h"
2 #include "lockfile.h"
3 #include "sequencer.h"
4 #include "dir.h"
5 #include "object.h"
6 #include "commit.h"
7 #include "tag.h"
8 #include "run-command.h"
9 #include "exec_cmd.h"
10 #include "utf8.h"
11 #include "cache-tree.h"
12 #include "diff.h"
13 #include "revision.h"
14 #include "rerere.h"
15 #include "merge-recursive.h"
16 #include "refs.h"
17 #include "argv-array.h"
18 #include "quote.h"
19 #include "trailer.h"
20 #include "log-tree.h"
21 #include "wt-status.h"
22
23 #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
24
25 const char sign_off_header[] = "Signed-off-by: ";
26 static const char cherry_picked_prefix[] = "(cherry picked from commit ";
27
28 GIT_PATH_FUNC(git_path_seq_dir, "sequencer")
29
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")
34
35 static GIT_PATH_FUNC(rebase_path, "rebase-merge")
36 /*
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'.
41 */
42 static GIT_PATH_FUNC(rebase_path_todo, "rebase-merge/git-rebase-todo")
43 /*
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
46 * actions.
47 */
48 static GIT_PATH_FUNC(rebase_path_done, "rebase-merge/done")
49 /*
50 * The file to keep track of how many commands were already processed (e.g.
51 * for the prompt).
52 */
53 static GIT_PATH_FUNC(rebase_path_msgnum, "rebase-merge/msgnum");
54 /*
55 * The file to keep track of how many commands are to be processed in total
56 * (e.g. for the prompt).
57 */
58 static GIT_PATH_FUNC(rebase_path_msgtotal, "rebase-merge/end");
59 /*
60 * The commit message that is planned to be used for any changes that
61 * need to be committed following a user interaction.
62 */
63 static GIT_PATH_FUNC(rebase_path_message, "rebase-merge/message")
64 /*
65 * The file into which is accumulated the suggested commit message for
66 * squash/fixup commands. When the first of a series of squash/fixups
67 * is seen, the file is created and the commit message from the
68 * previous commit and from the first squash/fixup commit are written
69 * to it. The commit message for each subsequent squash/fixup commit
70 * is appended to the file as it is processed.
71 *
72 * The first line of the file is of the form
73 * # This is a combination of $count commits.
74 * where $count is the number of commits whose messages have been
75 * written to the file so far (including the initial "pick" commit).
76 * Each time that a commit message is processed, this line is read and
77 * updated. It is deleted just before the combined commit is made.
78 */
79 static GIT_PATH_FUNC(rebase_path_squash_msg, "rebase-merge/message-squash")
80 /*
81 * If the current series of squash/fixups has not yet included a squash
82 * command, then this file exists and holds the commit message of the
83 * original "pick" commit. (If the series ends without a "squash"
84 * command, then this can be used as the commit message of the combined
85 * commit without opening the editor.)
86 */
87 static GIT_PATH_FUNC(rebase_path_fixup_msg, "rebase-merge/message-fixup")
88 /*
89 * A script to set the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and
90 * GIT_AUTHOR_DATE that will be used for the commit that is currently
91 * being rebased.
92 */
93 static GIT_PATH_FUNC(rebase_path_author_script, "rebase-merge/author-script")
94 /*
95 * When an "edit" rebase command is being processed, the SHA1 of the
96 * commit to be edited is recorded in this file. When "git rebase
97 * --continue" is executed, if there are any staged changes then they
98 * will be amended to the HEAD commit, but only provided the HEAD
99 * commit is still the commit to be edited. When any other rebase
100 * command is processed, this file is deleted.
101 */
102 static GIT_PATH_FUNC(rebase_path_amend, "rebase-merge/amend")
103 /*
104 * When we stop at a given patch via the "edit" command, this file contains
105 * the abbreviated commit name of the corresponding patch.
106 */
107 static GIT_PATH_FUNC(rebase_path_stopped_sha, "rebase-merge/stopped-sha")
108 /*
109 * For the post-rewrite hook, we make a list of rewritten commits and
110 * their new sha1s. The rewritten-pending list keeps the sha1s of
111 * commits that have been processed, but not committed yet,
112 * e.g. because they are waiting for a 'squash' command.
113 */
114 static GIT_PATH_FUNC(rebase_path_rewritten_list, "rebase-merge/rewritten-list")
115 static GIT_PATH_FUNC(rebase_path_rewritten_pending,
116 "rebase-merge/rewritten-pending")
117 /*
118 * The following files are written by git-rebase just after parsing the
119 * command-line (and are only consumed, not modified, by the sequencer).
120 */
121 static GIT_PATH_FUNC(rebase_path_gpg_sign_opt, "rebase-merge/gpg_sign_opt")
122 static GIT_PATH_FUNC(rebase_path_orig_head, "rebase-merge/orig-head")
123 static GIT_PATH_FUNC(rebase_path_verbose, "rebase-merge/verbose")
124 static GIT_PATH_FUNC(rebase_path_head_name, "rebase-merge/head-name")
125 static GIT_PATH_FUNC(rebase_path_onto, "rebase-merge/onto")
126 static GIT_PATH_FUNC(rebase_path_autostash, "rebase-merge/autostash")
127 static GIT_PATH_FUNC(rebase_path_strategy, "rebase-merge/strategy")
128 static GIT_PATH_FUNC(rebase_path_strategy_opts, "rebase-merge/strategy_opts")
129
130 static inline int is_rebase_i(const struct replay_opts *opts)
131 {
132 return opts->action == REPLAY_INTERACTIVE_REBASE;
133 }
134
135 static const char *get_dir(const struct replay_opts *opts)
136 {
137 if (is_rebase_i(opts))
138 return rebase_path();
139 return git_path_seq_dir();
140 }
141
142 static const char *get_todo_path(const struct replay_opts *opts)
143 {
144 if (is_rebase_i(opts))
145 return rebase_path_todo();
146 return git_path_todo_file();
147 }
148
149 /*
150 * Returns 0 for non-conforming footer
151 * Returns 1 for conforming footer
152 * Returns 2 when sob exists within conforming footer
153 * Returns 3 when sob exists within conforming footer as last entry
154 */
155 static int has_conforming_footer(struct strbuf *sb, struct strbuf *sob,
156 int ignore_footer)
157 {
158 struct trailer_info info;
159 int i;
160 int found_sob = 0, found_sob_last = 0;
161
162 trailer_info_get(&info, sb->buf);
163
164 if (info.trailer_start == info.trailer_end)
165 return 0;
166
167 for (i = 0; i < info.trailer_nr; i++)
168 if (sob && !strncmp(info.trailers[i], sob->buf, sob->len)) {
169 found_sob = 1;
170 if (i == info.trailer_nr - 1)
171 found_sob_last = 1;
172 }
173
174 trailer_info_release(&info);
175
176 if (found_sob_last)
177 return 3;
178 if (found_sob)
179 return 2;
180 return 1;
181 }
182
183 static const char *gpg_sign_opt_quoted(struct replay_opts *opts)
184 {
185 static struct strbuf buf = STRBUF_INIT;
186
187 strbuf_reset(&buf);
188 if (opts->gpg_sign)
189 sq_quotef(&buf, "-S%s", opts->gpg_sign);
190 return buf.buf;
191 }
192
193 int sequencer_remove_state(struct replay_opts *opts)
194 {
195 struct strbuf dir = STRBUF_INIT;
196 int i;
197
198 free(opts->gpg_sign);
199 free(opts->strategy);
200 for (i = 0; i < opts->xopts_nr; i++)
201 free(opts->xopts[i]);
202 free(opts->xopts);
203
204 strbuf_addf(&dir, "%s", get_dir(opts));
205 remove_dir_recursively(&dir, 0);
206 strbuf_release(&dir);
207
208 return 0;
209 }
210
211 static const char *action_name(const struct replay_opts *opts)
212 {
213 switch (opts->action) {
214 case REPLAY_REVERT:
215 return N_("revert");
216 case REPLAY_PICK:
217 return N_("cherry-pick");
218 case REPLAY_INTERACTIVE_REBASE:
219 return N_("rebase -i");
220 }
221 die(_("Unknown action: %d"), opts->action);
222 }
223
224 struct commit_message {
225 char *parent_label;
226 char *label;
227 char *subject;
228 const char *message;
229 };
230
231 static const char *short_commit_name(struct commit *commit)
232 {
233 return find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV);
234 }
235
236 static int get_message(struct commit *commit, struct commit_message *out)
237 {
238 const char *abbrev, *subject;
239 int subject_len;
240
241 out->message = logmsg_reencode(commit, NULL, get_commit_output_encoding());
242 abbrev = short_commit_name(commit);
243
244 subject_len = find_commit_subject(out->message, &subject);
245
246 out->subject = xmemdupz(subject, subject_len);
247 out->label = xstrfmt("%s... %s", abbrev, out->subject);
248 out->parent_label = xstrfmt("parent of %s", out->label);
249
250 return 0;
251 }
252
253 static void free_message(struct commit *commit, struct commit_message *msg)
254 {
255 free(msg->parent_label);
256 free(msg->label);
257 free(msg->subject);
258 unuse_commit_buffer(commit, msg->message);
259 }
260
261 static void print_advice(int show_hint, struct replay_opts *opts)
262 {
263 char *msg = getenv("GIT_CHERRY_PICK_HELP");
264
265 if (msg) {
266 fprintf(stderr, "%s\n", msg);
267 /*
268 * A conflict has occurred but the porcelain
269 * (typically rebase --interactive) wants to take care
270 * of the commit itself so remove CHERRY_PICK_HEAD
271 */
272 unlink(git_path_cherry_pick_head());
273 return;
274 }
275
276 if (show_hint) {
277 if (opts->no_commit)
278 advise(_("after resolving the conflicts, mark the corrected paths\n"
279 "with 'git add <paths>' or 'git rm <paths>'"));
280 else
281 advise(_("after resolving the conflicts, mark the corrected paths\n"
282 "with 'git add <paths>' or 'git rm <paths>'\n"
283 "and commit the result with 'git commit'"));
284 }
285 }
286
287 static int write_message(const void *buf, size_t len, const char *filename,
288 int append_eol)
289 {
290 static struct lock_file msg_file;
291
292 int msg_fd = hold_lock_file_for_update(&msg_file, filename, 0);
293 if (msg_fd < 0)
294 return error_errno(_("could not lock '%s'"), filename);
295 if (write_in_full(msg_fd, buf, len) < 0) {
296 rollback_lock_file(&msg_file);
297 return error_errno(_("could not write to '%s'"), filename);
298 }
299 if (append_eol && write(msg_fd, "\n", 1) < 0) {
300 rollback_lock_file(&msg_file);
301 return error_errno(_("could not write eol to '%s'"), filename);
302 }
303 if (commit_lock_file(&msg_file) < 0) {
304 rollback_lock_file(&msg_file);
305 return error(_("failed to finalize '%s'."), filename);
306 }
307
308 return 0;
309 }
310
311 /*
312 * Reads a file that was presumably written by a shell script, i.e. with an
313 * end-of-line marker that needs to be stripped.
314 *
315 * Note that only the last end-of-line marker is stripped, consistent with the
316 * behavior of "$(cat path)" in a shell script.
317 *
318 * Returns 1 if the file was read, 0 if it could not be read or does not exist.
319 */
320 static int read_oneliner(struct strbuf *buf,
321 const char *path, int skip_if_empty)
322 {
323 int orig_len = buf->len;
324
325 if (!file_exists(path))
326 return 0;
327
328 if (strbuf_read_file(buf, path, 0) < 0) {
329 warning_errno(_("could not read '%s'"), path);
330 return 0;
331 }
332
333 if (buf->len > orig_len && buf->buf[buf->len - 1] == '\n') {
334 if (--buf->len > orig_len && buf->buf[buf->len - 1] == '\r')
335 --buf->len;
336 buf->buf[buf->len] = '\0';
337 }
338
339 if (skip_if_empty && buf->len == orig_len)
340 return 0;
341
342 return 1;
343 }
344
345 static struct tree *empty_tree(void)
346 {
347 return lookup_tree(EMPTY_TREE_SHA1_BIN);
348 }
349
350 static int error_dirty_index(struct replay_opts *opts)
351 {
352 if (read_cache_unmerged())
353 return error_resolve_conflict(_(action_name(opts)));
354
355 error(_("your local changes would be overwritten by %s."),
356 _(action_name(opts)));
357
358 if (advice_commit_before_merge)
359 advise(_("commit your changes or stash them to proceed."));
360 return -1;
361 }
362
363 static void update_abort_safety_file(void)
364 {
365 struct object_id head;
366
367 /* Do nothing on a single-pick */
368 if (!file_exists(git_path_seq_dir()))
369 return;
370
371 if (!get_oid("HEAD", &head))
372 write_file(git_path_abort_safety_file(), "%s", oid_to_hex(&head));
373 else
374 write_file(git_path_abort_safety_file(), "%s", "");
375 }
376
377 static int fast_forward_to(const unsigned char *to, const unsigned char *from,
378 int unborn, struct replay_opts *opts)
379 {
380 struct ref_transaction *transaction;
381 struct strbuf sb = STRBUF_INIT;
382 struct strbuf err = STRBUF_INIT;
383
384 read_cache();
385 if (checkout_fast_forward(from, to, 1))
386 return -1; /* the callee should have complained already */
387
388 strbuf_addf(&sb, _("%s: fast-forward"), _(action_name(opts)));
389
390 transaction = ref_transaction_begin(&err);
391 if (!transaction ||
392 ref_transaction_update(transaction, "HEAD",
393 to, unborn ? null_sha1 : from,
394 0, sb.buf, &err) ||
395 ref_transaction_commit(transaction, &err)) {
396 ref_transaction_free(transaction);
397 error("%s", err.buf);
398 strbuf_release(&sb);
399 strbuf_release(&err);
400 return -1;
401 }
402
403 strbuf_release(&sb);
404 strbuf_release(&err);
405 ref_transaction_free(transaction);
406 update_abort_safety_file();
407 return 0;
408 }
409
410 void append_conflicts_hint(struct strbuf *msgbuf)
411 {
412 int i;
413
414 strbuf_addch(msgbuf, '\n');
415 strbuf_commented_addf(msgbuf, "Conflicts:\n");
416 for (i = 0; i < active_nr;) {
417 const struct cache_entry *ce = active_cache[i++];
418 if (ce_stage(ce)) {
419 strbuf_commented_addf(msgbuf, "\t%s\n", ce->name);
420 while (i < active_nr && !strcmp(ce->name,
421 active_cache[i]->name))
422 i++;
423 }
424 }
425 }
426
427 static int do_recursive_merge(struct commit *base, struct commit *next,
428 const char *base_label, const char *next_label,
429 unsigned char *head, struct strbuf *msgbuf,
430 struct replay_opts *opts)
431 {
432 struct merge_options o;
433 struct tree *result, *next_tree, *base_tree, *head_tree;
434 int clean;
435 char **xopt;
436 static struct lock_file index_lock;
437
438 hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR);
439
440 read_cache();
441
442 init_merge_options(&o);
443 o.ancestor = base ? base_label : "(empty tree)";
444 o.branch1 = "HEAD";
445 o.branch2 = next ? next_label : "(empty tree)";
446 if (is_rebase_i(opts))
447 o.buffer_output = 2;
448
449 head_tree = parse_tree_indirect(head);
450 next_tree = next ? next->tree : empty_tree();
451 base_tree = base ? base->tree : empty_tree();
452
453 for (xopt = opts->xopts; xopt != opts->xopts + opts->xopts_nr; xopt++)
454 parse_merge_opt(&o, *xopt);
455
456 clean = merge_trees(&o,
457 head_tree,
458 next_tree, base_tree, &result);
459 if (is_rebase_i(opts) && clean <= 0)
460 fputs(o.obuf.buf, stdout);
461 strbuf_release(&o.obuf);
462 if (clean < 0)
463 return clean;
464
465 if (active_cache_changed &&
466 write_locked_index(&the_index, &index_lock, COMMIT_LOCK))
467 /*
468 * TRANSLATORS: %s will be "revert", "cherry-pick" or
469 * "rebase -i".
470 */
471 return error(_("%s: Unable to write new index file"),
472 _(action_name(opts)));
473 rollback_lock_file(&index_lock);
474
475 if (opts->signoff)
476 append_signoff(msgbuf, 0, 0);
477
478 if (!clean)
479 append_conflicts_hint(msgbuf);
480
481 return !clean;
482 }
483
484 static int is_index_unchanged(void)
485 {
486 unsigned char head_sha1[20];
487 struct commit *head_commit;
488
489 if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, head_sha1, NULL))
490 return error(_("could not resolve HEAD commit\n"));
491
492 head_commit = lookup_commit(head_sha1);
493
494 /*
495 * If head_commit is NULL, check_commit, called from
496 * lookup_commit, would have indicated that head_commit is not
497 * a commit object already. parse_commit() will return failure
498 * without further complaints in such a case. Otherwise, if
499 * the commit is invalid, parse_commit() will complain. So
500 * there is nothing for us to say here. Just return failure.
501 */
502 if (parse_commit(head_commit))
503 return -1;
504
505 if (!active_cache_tree)
506 active_cache_tree = cache_tree();
507
508 if (!cache_tree_fully_valid(active_cache_tree))
509 if (cache_tree_update(&the_index, 0))
510 return error(_("unable to update cache tree\n"));
511
512 return !hashcmp(active_cache_tree->sha1, head_commit->tree->object.oid.hash);
513 }
514
515 static int write_author_script(const char *message)
516 {
517 struct strbuf buf = STRBUF_INIT;
518 const char *eol;
519 int res;
520
521 for (;;)
522 if (!*message || starts_with(message, "\n")) {
523 missing_author:
524 /* Missing 'author' line? */
525 unlink(rebase_path_author_script());
526 return 0;
527 } else if (skip_prefix(message, "author ", &message))
528 break;
529 else if ((eol = strchr(message, '\n')))
530 message = eol + 1;
531 else
532 goto missing_author;
533
534 strbuf_addstr(&buf, "GIT_AUTHOR_NAME='");
535 while (*message && *message != '\n' && *message != '\r')
536 if (skip_prefix(message, " <", &message))
537 break;
538 else if (*message != '\'')
539 strbuf_addch(&buf, *(message++));
540 else
541 strbuf_addf(&buf, "'\\\\%c'", *(message++));
542 strbuf_addstr(&buf, "'\nGIT_AUTHOR_EMAIL='");
543 while (*message && *message != '\n' && *message != '\r')
544 if (skip_prefix(message, "> ", &message))
545 break;
546 else if (*message != '\'')
547 strbuf_addch(&buf, *(message++));
548 else
549 strbuf_addf(&buf, "'\\\\%c'", *(message++));
550 strbuf_addstr(&buf, "'\nGIT_AUTHOR_DATE='@");
551 while (*message && *message != '\n' && *message != '\r')
552 if (*message != '\'')
553 strbuf_addch(&buf, *(message++));
554 else
555 strbuf_addf(&buf, "'\\\\%c'", *(message++));
556 res = write_message(buf.buf, buf.len, rebase_path_author_script(), 1);
557 strbuf_release(&buf);
558 return res;
559 }
560
561 /*
562 * Read a list of environment variable assignments (such as the author-script
563 * file) into an environment block. Returns -1 on error, 0 otherwise.
564 */
565 static int read_env_script(struct argv_array *env)
566 {
567 struct strbuf script = STRBUF_INIT;
568 int i, count = 0;
569 char *p, *p2;
570
571 if (strbuf_read_file(&script, rebase_path_author_script(), 256) <= 0)
572 return -1;
573
574 for (p = script.buf; *p; p++)
575 if (skip_prefix(p, "'\\\\''", (const char **)&p2))
576 strbuf_splice(&script, p - script.buf, p2 - p, "'", 1);
577 else if (*p == '\'')
578 strbuf_splice(&script, p-- - script.buf, 1, "", 0);
579 else if (*p == '\n') {
580 *p = '\0';
581 count++;
582 }
583
584 for (i = 0, p = script.buf; i < count; i++) {
585 argv_array_push(env, p);
586 p += strlen(p) + 1;
587 }
588
589 return 0;
590 }
591
592 static const char staged_changes_advice[] =
593 N_("you have staged changes in your working tree\n"
594 "If these changes are meant to be squashed into the previous commit, run:\n"
595 "\n"
596 " git commit --amend %s\n"
597 "\n"
598 "If they are meant to go into a new commit, run:\n"
599 "\n"
600 " git commit %s\n"
601 "\n"
602 "In both cases, once you're done, continue with:\n"
603 "\n"
604 " git rebase --continue\n");
605
606 #define ALLOW_EMPTY (1<<0)
607 #define EDIT_MSG (1<<1)
608 #define AMEND_MSG (1<<2)
609 #define CLEANUP_MSG (1<<3)
610 #define VERIFY_MSG (1<<4)
611
612 /*
613 * If we are cherry-pick, and if the merge did not result in
614 * hand-editing, we will hit this commit and inherit the original
615 * author date and name.
616 *
617 * If we are revert, or if our cherry-pick results in a hand merge,
618 * we had better say that the current user is responsible for that.
619 *
620 * An exception is when run_git_commit() is called during an
621 * interactive rebase: in that case, we will want to retain the
622 * author metadata.
623 */
624 static int run_git_commit(const char *defmsg, struct replay_opts *opts,
625 unsigned int flags)
626 {
627 struct child_process cmd = CHILD_PROCESS_INIT;
628 const char *value;
629
630 cmd.git_cmd = 1;
631
632 if (is_rebase_i(opts)) {
633 if (!(flags & EDIT_MSG)) {
634 cmd.stdout_to_stderr = 1;
635 cmd.err = -1;
636 }
637
638 if (read_env_script(&cmd.env_array)) {
639 const char *gpg_opt = gpg_sign_opt_quoted(opts);
640
641 return error(_(staged_changes_advice),
642 gpg_opt, gpg_opt);
643 }
644 }
645
646 argv_array_push(&cmd.args, "commit");
647
648 if (!(flags & VERIFY_MSG))
649 argv_array_push(&cmd.args, "-n");
650 if ((flags & AMEND_MSG))
651 argv_array_push(&cmd.args, "--amend");
652 if (opts->gpg_sign)
653 argv_array_pushf(&cmd.args, "-S%s", opts->gpg_sign);
654 if (opts->signoff)
655 argv_array_push(&cmd.args, "-s");
656 if (defmsg)
657 argv_array_pushl(&cmd.args, "-F", defmsg, NULL);
658 if ((flags & CLEANUP_MSG))
659 argv_array_push(&cmd.args, "--cleanup=strip");
660 if ((flags & EDIT_MSG))
661 argv_array_push(&cmd.args, "-e");
662 else if (!(flags & CLEANUP_MSG) &&
663 !opts->signoff && !opts->record_origin &&
664 git_config_get_value("commit.cleanup", &value))
665 argv_array_push(&cmd.args, "--cleanup=verbatim");
666
667 if ((flags & ALLOW_EMPTY))
668 argv_array_push(&cmd.args, "--allow-empty");
669
670 if (opts->allow_empty_message)
671 argv_array_push(&cmd.args, "--allow-empty-message");
672
673 if (cmd.err == -1) {
674 /* hide stderr on success */
675 struct strbuf buf = STRBUF_INIT;
676 int rc = pipe_command(&cmd,
677 NULL, 0,
678 /* stdout is already redirected */
679 NULL, 0,
680 &buf, 0);
681 if (rc)
682 fputs(buf.buf, stderr);
683 strbuf_release(&buf);
684 return rc;
685 }
686
687 return run_command(&cmd);
688 }
689
690 static int is_original_commit_empty(struct commit *commit)
691 {
692 const unsigned char *ptree_sha1;
693
694 if (parse_commit(commit))
695 return error(_("could not parse commit %s\n"),
696 oid_to_hex(&commit->object.oid));
697 if (commit->parents) {
698 struct commit *parent = commit->parents->item;
699 if (parse_commit(parent))
700 return error(_("could not parse parent commit %s\n"),
701 oid_to_hex(&parent->object.oid));
702 ptree_sha1 = parent->tree->object.oid.hash;
703 } else {
704 ptree_sha1 = EMPTY_TREE_SHA1_BIN; /* commit is root */
705 }
706
707 return !hashcmp(ptree_sha1, commit->tree->object.oid.hash);
708 }
709
710 /*
711 * Do we run "git commit" with "--allow-empty"?
712 */
713 static int allow_empty(struct replay_opts *opts, struct commit *commit)
714 {
715 int index_unchanged, empty_commit;
716
717 /*
718 * Three cases:
719 *
720 * (1) we do not allow empty at all and error out.
721 *
722 * (2) we allow ones that were initially empty, but
723 * forbid the ones that become empty;
724 *
725 * (3) we allow both.
726 */
727 if (!opts->allow_empty)
728 return 0; /* let "git commit" barf as necessary */
729
730 index_unchanged = is_index_unchanged();
731 if (index_unchanged < 0)
732 return index_unchanged;
733 if (!index_unchanged)
734 return 0; /* we do not have to say --allow-empty */
735
736 if (opts->keep_redundant_commits)
737 return 1;
738
739 empty_commit = is_original_commit_empty(commit);
740 if (empty_commit < 0)
741 return empty_commit;
742 if (!empty_commit)
743 return 0;
744 else
745 return 1;
746 }
747
748 /*
749 * Note that ordering matters in this enum. Not only must it match the mapping
750 * below, it is also divided into several sections that matter. When adding
751 * new commands, make sure you add it in the right section.
752 */
753 enum todo_command {
754 /* commands that handle commits */
755 TODO_PICK = 0,
756 TODO_REVERT,
757 TODO_EDIT,
758 TODO_REWORD,
759 TODO_FIXUP,
760 TODO_SQUASH,
761 /* commands that do something else than handling a single commit */
762 TODO_EXEC,
763 /* commands that do nothing but are counted for reporting progress */
764 TODO_NOOP,
765 TODO_DROP,
766 /* comments (not counted for reporting progress) */
767 TODO_COMMENT
768 };
769
770 static struct {
771 char c;
772 const char *str;
773 } todo_command_info[] = {
774 { 'p', "pick" },
775 { 0, "revert" },
776 { 'e', "edit" },
777 { 'r', "reword" },
778 { 'f', "fixup" },
779 { 's', "squash" },
780 { 'x', "exec" },
781 { 0, "noop" },
782 { 'd', "drop" },
783 { 0, NULL }
784 };
785
786 static const char *command_to_string(const enum todo_command command)
787 {
788 if (command < TODO_COMMENT)
789 return todo_command_info[command].str;
790 die("Unknown command: %d", command);
791 }
792
793 static int is_noop(const enum todo_command command)
794 {
795 return TODO_NOOP <= command;
796 }
797
798 static int is_fixup(enum todo_command command)
799 {
800 return command == TODO_FIXUP || command == TODO_SQUASH;
801 }
802
803 static int update_squash_messages(enum todo_command command,
804 struct commit *commit, struct replay_opts *opts)
805 {
806 struct strbuf buf = STRBUF_INIT;
807 int count, res;
808 const char *message, *body;
809
810 if (file_exists(rebase_path_squash_msg())) {
811 struct strbuf header = STRBUF_INIT;
812 char *eol, *p;
813
814 if (strbuf_read_file(&buf, rebase_path_squash_msg(), 2048) <= 0)
815 return error(_("could not read '%s'"),
816 rebase_path_squash_msg());
817
818 p = buf.buf + 1;
819 eol = strchrnul(buf.buf, '\n');
820 if (buf.buf[0] != comment_line_char ||
821 (p += strcspn(p, "0123456789\n")) == eol)
822 return error(_("unexpected 1st line of squash message:"
823 "\n\n\t%.*s"),
824 (int)(eol - buf.buf), buf.buf);
825 count = strtol(p, NULL, 10);
826
827 if (count < 1)
828 return error(_("invalid 1st line of squash message:\n"
829 "\n\t%.*s"),
830 (int)(eol - buf.buf), buf.buf);
831
832 strbuf_addf(&header, "%c ", comment_line_char);
833 strbuf_addf(&header,
834 _("This is a combination of %d commits."), ++count);
835 strbuf_splice(&buf, 0, eol - buf.buf, header.buf, header.len);
836 strbuf_release(&header);
837 } else {
838 unsigned char head[20];
839 struct commit *head_commit;
840 const char *head_message, *body;
841
842 if (get_sha1("HEAD", head))
843 return error(_("need a HEAD to fixup"));
844 if (!(head_commit = lookup_commit_reference(head)))
845 return error(_("could not read HEAD"));
846 if (!(head_message = get_commit_buffer(head_commit, NULL)))
847 return error(_("could not read HEAD's commit message"));
848
849 find_commit_subject(head_message, &body);
850 if (write_message(body, strlen(body),
851 rebase_path_fixup_msg(), 0)) {
852 unuse_commit_buffer(head_commit, head_message);
853 return error(_("cannot write '%s'"),
854 rebase_path_fixup_msg());
855 }
856
857 count = 2;
858 strbuf_addf(&buf, "%c ", comment_line_char);
859 strbuf_addf(&buf, _("This is a combination of %d commits."),
860 count);
861 strbuf_addf(&buf, "\n%c ", comment_line_char);
862 strbuf_addstr(&buf, _("This is the 1st commit message:"));
863 strbuf_addstr(&buf, "\n\n");
864 strbuf_addstr(&buf, body);
865
866 unuse_commit_buffer(head_commit, head_message);
867 }
868
869 if (!(message = get_commit_buffer(commit, NULL)))
870 return error(_("could not read commit message of %s"),
871 oid_to_hex(&commit->object.oid));
872 find_commit_subject(message, &body);
873
874 if (command == TODO_SQUASH) {
875 unlink(rebase_path_fixup_msg());
876 strbuf_addf(&buf, "\n%c ", comment_line_char);
877 strbuf_addf(&buf, _("This is the commit message #%d:"), count);
878 strbuf_addstr(&buf, "\n\n");
879 strbuf_addstr(&buf, body);
880 } else if (command == TODO_FIXUP) {
881 strbuf_addf(&buf, "\n%c ", comment_line_char);
882 strbuf_addf(&buf, _("The commit message #%d will be skipped:"),
883 count);
884 strbuf_addstr(&buf, "\n\n");
885 strbuf_add_commented_lines(&buf, body, strlen(body));
886 } else
887 return error(_("unknown command: %d"), command);
888 unuse_commit_buffer(commit, message);
889
890 res = write_message(buf.buf, buf.len, rebase_path_squash_msg(), 0);
891 strbuf_release(&buf);
892 return res;
893 }
894
895 static void flush_rewritten_pending(void) {
896 struct strbuf buf = STRBUF_INIT;
897 unsigned char newsha1[20];
898 FILE *out;
899
900 if (strbuf_read_file(&buf, rebase_path_rewritten_pending(), 82) > 0 &&
901 !get_sha1("HEAD", newsha1) &&
902 (out = fopen(rebase_path_rewritten_list(), "a"))) {
903 char *bol = buf.buf, *eol;
904
905 while (*bol) {
906 eol = strchrnul(bol, '\n');
907 fprintf(out, "%.*s %s\n", (int)(eol - bol),
908 bol, sha1_to_hex(newsha1));
909 if (!*eol)
910 break;
911 bol = eol + 1;
912 }
913 fclose(out);
914 unlink(rebase_path_rewritten_pending());
915 }
916 strbuf_release(&buf);
917 }
918
919 static void record_in_rewritten(struct object_id *oid,
920 enum todo_command next_command) {
921 FILE *out = fopen(rebase_path_rewritten_pending(), "a");
922
923 if (!out)
924 return;
925
926 fprintf(out, "%s\n", oid_to_hex(oid));
927 fclose(out);
928
929 if (!is_fixup(next_command))
930 flush_rewritten_pending();
931 }
932
933 static int do_pick_commit(enum todo_command command, struct commit *commit,
934 struct replay_opts *opts, int final_fixup)
935 {
936 unsigned int flags = opts->edit ? EDIT_MSG : 0;
937 const char *msg_file = opts->edit ? NULL : git_path_merge_msg();
938 unsigned char head[20];
939 struct commit *base, *next, *parent;
940 const char *base_label, *next_label;
941 struct commit_message msg = { NULL, NULL, NULL, NULL };
942 struct strbuf msgbuf = STRBUF_INIT;
943 int res, unborn = 0, allow;
944
945 if (opts->no_commit) {
946 /*
947 * We do not intend to commit immediately. We just want to
948 * merge the differences in, so let's compute the tree
949 * that represents the "current" state for merge-recursive
950 * to work on.
951 */
952 if (write_cache_as_tree(head, 0, NULL))
953 return error(_("your index file is unmerged."));
954 } else {
955 unborn = get_sha1("HEAD", head);
956 if (unborn)
957 hashcpy(head, EMPTY_TREE_SHA1_BIN);
958 if (index_differs_from(unborn ? EMPTY_TREE_SHA1_HEX : "HEAD", 0, 0))
959 return error_dirty_index(opts);
960 }
961 discard_cache();
962
963 if (!commit->parents)
964 parent = NULL;
965 else if (commit->parents->next) {
966 /* Reverting or cherry-picking a merge commit */
967 int cnt;
968 struct commit_list *p;
969
970 if (!opts->mainline)
971 return error(_("commit %s is a merge but no -m option was given."),
972 oid_to_hex(&commit->object.oid));
973
974 for (cnt = 1, p = commit->parents;
975 cnt != opts->mainline && p;
976 cnt++)
977 p = p->next;
978 if (cnt != opts->mainline || !p)
979 return error(_("commit %s does not have parent %d"),
980 oid_to_hex(&commit->object.oid), opts->mainline);
981 parent = p->item;
982 } else if (0 < opts->mainline)
983 return error(_("mainline was specified but commit %s is not a merge."),
984 oid_to_hex(&commit->object.oid));
985 else
986 parent = commit->parents->item;
987
988 if (get_message(commit, &msg) != 0)
989 return error(_("cannot get commit message for %s"),
990 oid_to_hex(&commit->object.oid));
991
992 if (opts->allow_ff && !is_fixup(command) &&
993 ((parent && !hashcmp(parent->object.oid.hash, head)) ||
994 (!parent && unborn))) {
995 if (is_rebase_i(opts))
996 write_author_script(msg.message);
997 res = fast_forward_to(commit->object.oid.hash, head, unborn,
998 opts);
999 if (res || command != TODO_REWORD)
1000 goto leave;
1001 flags |= EDIT_MSG | AMEND_MSG;
1002 if (command == TODO_REWORD)
1003 flags |= VERIFY_MSG;
1004 msg_file = NULL;
1005 goto fast_forward_edit;
1006 }
1007 if (parent && parse_commit(parent) < 0)
1008 /* TRANSLATORS: The first %s will be a "todo" command like
1009 "revert" or "pick", the second %s a SHA1. */
1010 return error(_("%s: cannot parse parent commit %s"),
1011 command_to_string(command),
1012 oid_to_hex(&parent->object.oid));
1013
1014 /*
1015 * "commit" is an existing commit. We would want to apply
1016 * the difference it introduces since its first parent "prev"
1017 * on top of the current HEAD if we are cherry-pick. Or the
1018 * reverse of it if we are revert.
1019 */
1020
1021 if (command == TODO_REVERT) {
1022 base = commit;
1023 base_label = msg.label;
1024 next = parent;
1025 next_label = msg.parent_label;
1026 strbuf_addstr(&msgbuf, "Revert \"");
1027 strbuf_addstr(&msgbuf, msg.subject);
1028 strbuf_addstr(&msgbuf, "\"\n\nThis reverts commit ");
1029 strbuf_addstr(&msgbuf, oid_to_hex(&commit->object.oid));
1030
1031 if (commit->parents && commit->parents->next) {
1032 strbuf_addstr(&msgbuf, ", reversing\nchanges made to ");
1033 strbuf_addstr(&msgbuf, oid_to_hex(&parent->object.oid));
1034 }
1035 strbuf_addstr(&msgbuf, ".\n");
1036 } else {
1037 const char *p;
1038
1039 base = parent;
1040 base_label = msg.parent_label;
1041 next = commit;
1042 next_label = msg.label;
1043
1044 /* Append the commit log message to msgbuf. */
1045 if (find_commit_subject(msg.message, &p))
1046 strbuf_addstr(&msgbuf, p);
1047
1048 if (opts->record_origin) {
1049 strbuf_complete_line(&msgbuf);
1050 if (!has_conforming_footer(&msgbuf, NULL, 0))
1051 strbuf_addch(&msgbuf, '\n');
1052 strbuf_addstr(&msgbuf, cherry_picked_prefix);
1053 strbuf_addstr(&msgbuf, oid_to_hex(&commit->object.oid));
1054 strbuf_addstr(&msgbuf, ")\n");
1055 }
1056 }
1057
1058 if (command == TODO_REWORD)
1059 flags |= EDIT_MSG | VERIFY_MSG;
1060 else if (is_fixup(command)) {
1061 if (update_squash_messages(command, commit, opts))
1062 return -1;
1063 flags |= AMEND_MSG;
1064 if (!final_fixup)
1065 msg_file = rebase_path_squash_msg();
1066 else if (file_exists(rebase_path_fixup_msg())) {
1067 flags |= CLEANUP_MSG;
1068 msg_file = rebase_path_fixup_msg();
1069 } else {
1070 const char *dest = git_path_squash_msg();
1071 unlink(dest);
1072 if (copy_file(dest, rebase_path_squash_msg(), 0666))
1073 return error(_("could not rename '%s' to '%s'"),
1074 rebase_path_squash_msg(), dest);
1075 unlink(git_path_merge_msg());
1076 msg_file = dest;
1077 flags |= EDIT_MSG;
1078 }
1079 }
1080
1081 if (is_rebase_i(opts) && write_author_script(msg.message) < 0)
1082 res = -1;
1083 else if (!opts->strategy || !strcmp(opts->strategy, "recursive") || command == TODO_REVERT) {
1084 res = do_recursive_merge(base, next, base_label, next_label,
1085 head, &msgbuf, opts);
1086 if (res < 0)
1087 return res;
1088 res |= write_message(msgbuf.buf, msgbuf.len,
1089 git_path_merge_msg(), 0);
1090 } else {
1091 struct commit_list *common = NULL;
1092 struct commit_list *remotes = NULL;
1093
1094 res = write_message(msgbuf.buf, msgbuf.len,
1095 git_path_merge_msg(), 0);
1096
1097 commit_list_insert(base, &common);
1098 commit_list_insert(next, &remotes);
1099 res |= try_merge_command(opts->strategy,
1100 opts->xopts_nr, (const char **)opts->xopts,
1101 common, sha1_to_hex(head), remotes);
1102 free_commit_list(common);
1103 free_commit_list(remotes);
1104 }
1105 strbuf_release(&msgbuf);
1106
1107 /*
1108 * If the merge was clean or if it failed due to conflict, we write
1109 * CHERRY_PICK_HEAD for the subsequent invocation of commit to use.
1110 * However, if the merge did not even start, then we don't want to
1111 * write it at all.
1112 */
1113 if (command == TODO_PICK && !opts->no_commit && (res == 0 || res == 1) &&
1114 update_ref(NULL, "CHERRY_PICK_HEAD", commit->object.oid.hash, NULL,
1115 REF_NODEREF, UPDATE_REFS_MSG_ON_ERR))
1116 res = -1;
1117 if (command == TODO_REVERT && ((opts->no_commit && res == 0) || res == 1) &&
1118 update_ref(NULL, "REVERT_HEAD", commit->object.oid.hash, NULL,
1119 REF_NODEREF, UPDATE_REFS_MSG_ON_ERR))
1120 res = -1;
1121
1122 if (res) {
1123 error(command == TODO_REVERT
1124 ? _("could not revert %s... %s")
1125 : _("could not apply %s... %s"),
1126 short_commit_name(commit), msg.subject);
1127 print_advice(res == 1, opts);
1128 rerere(opts->allow_rerere_auto);
1129 goto leave;
1130 }
1131
1132 allow = allow_empty(opts, commit);
1133 if (allow < 0) {
1134 res = allow;
1135 goto leave;
1136 } else if (allow)
1137 flags |= ALLOW_EMPTY;
1138 if (!opts->no_commit)
1139 fast_forward_edit:
1140 res = run_git_commit(msg_file, opts, flags);
1141
1142 if (!res && final_fixup) {
1143 unlink(rebase_path_fixup_msg());
1144 unlink(rebase_path_squash_msg());
1145 }
1146
1147 leave:
1148 free_message(commit, &msg);
1149 update_abort_safety_file();
1150
1151 return res;
1152 }
1153
1154 static int prepare_revs(struct replay_opts *opts)
1155 {
1156 /*
1157 * picking (but not reverting) ranges (but not individual revisions)
1158 * should be done in reverse
1159 */
1160 if (opts->action == REPLAY_PICK && !opts->revs->no_walk)
1161 opts->revs->reverse ^= 1;
1162
1163 if (prepare_revision_walk(opts->revs))
1164 return error(_("revision walk setup failed"));
1165
1166 if (!opts->revs->commits)
1167 return error(_("empty commit set passed"));
1168 return 0;
1169 }
1170
1171 static int read_and_refresh_cache(struct replay_opts *opts)
1172 {
1173 static struct lock_file index_lock;
1174 int index_fd = hold_locked_index(&index_lock, 0);
1175 if (read_index_preload(&the_index, NULL) < 0) {
1176 rollback_lock_file(&index_lock);
1177 return error(_("git %s: failed to read the index"),
1178 _(action_name(opts)));
1179 }
1180 refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, NULL, NULL, NULL);
1181 if (the_index.cache_changed && index_fd >= 0) {
1182 if (write_locked_index(&the_index, &index_lock, COMMIT_LOCK)) {
1183 rollback_lock_file(&index_lock);
1184 return error(_("git %s: failed to refresh the index"),
1185 _(action_name(opts)));
1186 }
1187 }
1188 rollback_lock_file(&index_lock);
1189 return 0;
1190 }
1191
1192 struct todo_item {
1193 enum todo_command command;
1194 struct commit *commit;
1195 const char *arg;
1196 int arg_len;
1197 size_t offset_in_buf;
1198 };
1199
1200 struct todo_list {
1201 struct strbuf buf;
1202 struct todo_item *items;
1203 int nr, alloc, current;
1204 int done_nr, total_nr;
1205 struct stat_data stat;
1206 };
1207
1208 #define TODO_LIST_INIT { STRBUF_INIT }
1209
1210 static void todo_list_release(struct todo_list *todo_list)
1211 {
1212 strbuf_release(&todo_list->buf);
1213 free(todo_list->items);
1214 todo_list->items = NULL;
1215 todo_list->nr = todo_list->alloc = 0;
1216 }
1217
1218 static struct todo_item *append_new_todo(struct todo_list *todo_list)
1219 {
1220 ALLOC_GROW(todo_list->items, todo_list->nr + 1, todo_list->alloc);
1221 return todo_list->items + todo_list->nr++;
1222 }
1223
1224 static int parse_insn_line(struct todo_item *item, const char *bol, char *eol)
1225 {
1226 unsigned char commit_sha1[20];
1227 char *end_of_object_name;
1228 int i, saved, status, padding;
1229
1230 /* left-trim */
1231 bol += strspn(bol, " \t");
1232
1233 if (bol == eol || *bol == '\r' || *bol == comment_line_char) {
1234 item->command = TODO_COMMENT;
1235 item->commit = NULL;
1236 item->arg = bol;
1237 item->arg_len = eol - bol;
1238 return 0;
1239 }
1240
1241 for (i = 0; i < TODO_COMMENT; i++)
1242 if (skip_prefix(bol, todo_command_info[i].str, &bol)) {
1243 item->command = i;
1244 break;
1245 } else if (bol[1] == ' ' && *bol == todo_command_info[i].c) {
1246 bol++;
1247 item->command = i;
1248 break;
1249 }
1250 if (i >= TODO_COMMENT)
1251 return -1;
1252
1253 if (item->command == TODO_NOOP) {
1254 item->commit = NULL;
1255 item->arg = bol;
1256 item->arg_len = eol - bol;
1257 return 0;
1258 }
1259
1260 /* Eat up extra spaces/ tabs before object name */
1261 padding = strspn(bol, " \t");
1262 if (!padding)
1263 return -1;
1264 bol += padding;
1265
1266 if (item->command == TODO_EXEC) {
1267 item->arg = bol;
1268 item->arg_len = (int)(eol - bol);
1269 return 0;
1270 }
1271
1272 end_of_object_name = (char *) bol + strcspn(bol, " \t\n");
1273 saved = *end_of_object_name;
1274 *end_of_object_name = '\0';
1275 status = get_sha1(bol, commit_sha1);
1276 *end_of_object_name = saved;
1277
1278 item->arg = end_of_object_name + strspn(end_of_object_name, " \t");
1279 item->arg_len = (int)(eol - item->arg);
1280
1281 if (status < 0)
1282 return -1;
1283
1284 item->commit = lookup_commit_reference(commit_sha1);
1285 return !item->commit;
1286 }
1287
1288 static int parse_insn_buffer(char *buf, struct todo_list *todo_list)
1289 {
1290 struct todo_item *item;
1291 char *p = buf, *next_p;
1292 int i, res = 0, fixup_okay = file_exists(rebase_path_done());
1293
1294 for (i = 1; *p; i++, p = next_p) {
1295 char *eol = strchrnul(p, '\n');
1296
1297 next_p = *eol ? eol + 1 /* skip LF */ : eol;
1298
1299 if (p != eol && eol[-1] == '\r')
1300 eol--; /* strip Carriage Return */
1301
1302 item = append_new_todo(todo_list);
1303 item->offset_in_buf = p - todo_list->buf.buf;
1304 if (parse_insn_line(item, p, eol)) {
1305 res = error(_("invalid line %d: %.*s"),
1306 i, (int)(eol - p), p);
1307 item->command = TODO_NOOP;
1308 }
1309
1310 if (fixup_okay)
1311 ; /* do nothing */
1312 else if (is_fixup(item->command))
1313 return error(_("cannot '%s' without a previous commit"),
1314 command_to_string(item->command));
1315 else if (!is_noop(item->command))
1316 fixup_okay = 1;
1317 }
1318
1319 return res;
1320 }
1321
1322 static int count_commands(struct todo_list *todo_list)
1323 {
1324 int count = 0, i;
1325
1326 for (i = 0; i < todo_list->nr; i++)
1327 if (todo_list->items[i].command != TODO_COMMENT)
1328 count++;
1329
1330 return count;
1331 }
1332
1333 static int read_populate_todo(struct todo_list *todo_list,
1334 struct replay_opts *opts)
1335 {
1336 struct stat st;
1337 const char *todo_file = get_todo_path(opts);
1338 int fd, res;
1339
1340 strbuf_reset(&todo_list->buf);
1341 fd = open(todo_file, O_RDONLY);
1342 if (fd < 0)
1343 return error_errno(_("could not open '%s'"), todo_file);
1344 if (strbuf_read(&todo_list->buf, fd, 0) < 0) {
1345 close(fd);
1346 return error(_("could not read '%s'."), todo_file);
1347 }
1348 close(fd);
1349
1350 res = stat(todo_file, &st);
1351 if (res)
1352 return error(_("could not stat '%s'"), todo_file);
1353 fill_stat_data(&todo_list->stat, &st);
1354
1355 res = parse_insn_buffer(todo_list->buf.buf, todo_list);
1356 if (res) {
1357 if (is_rebase_i(opts))
1358 return error(_("please fix this using "
1359 "'git rebase --edit-todo'."));
1360 return error(_("unusable instruction sheet: '%s'"), todo_file);
1361 }
1362
1363 if (!todo_list->nr &&
1364 (!is_rebase_i(opts) || !file_exists(rebase_path_done())))
1365 return error(_("no commits parsed."));
1366
1367 if (!is_rebase_i(opts)) {
1368 enum todo_command valid =
1369 opts->action == REPLAY_PICK ? TODO_PICK : TODO_REVERT;
1370 int i;
1371
1372 for (i = 0; i < todo_list->nr; i++)
1373 if (valid == todo_list->items[i].command)
1374 continue;
1375 else if (valid == TODO_PICK)
1376 return error(_("cannot cherry-pick during a revert."));
1377 else
1378 return error(_("cannot revert during a cherry-pick."));
1379 }
1380
1381 if (is_rebase_i(opts)) {
1382 struct todo_list done = TODO_LIST_INIT;
1383 FILE *f = fopen(rebase_path_msgtotal(), "w");
1384
1385 if (strbuf_read_file(&done.buf, rebase_path_done(), 0) > 0 &&
1386 !parse_insn_buffer(done.buf.buf, &done))
1387 todo_list->done_nr = count_commands(&done);
1388 else
1389 todo_list->done_nr = 0;
1390
1391 todo_list->total_nr = todo_list->done_nr
1392 + count_commands(todo_list);
1393 todo_list_release(&done);
1394
1395 if (f) {
1396 fprintf(f, "%d\n", todo_list->total_nr);
1397 fclose(f);
1398 }
1399 }
1400
1401 return 0;
1402 }
1403
1404 static int git_config_string_dup(char **dest,
1405 const char *var, const char *value)
1406 {
1407 if (!value)
1408 return config_error_nonbool(var);
1409 free(*dest);
1410 *dest = xstrdup(value);
1411 return 0;
1412 }
1413
1414 static int populate_opts_cb(const char *key, const char *value, void *data)
1415 {
1416 struct replay_opts *opts = data;
1417 int error_flag = 1;
1418
1419 if (!value)
1420 error_flag = 0;
1421 else if (!strcmp(key, "options.no-commit"))
1422 opts->no_commit = git_config_bool_or_int(key, value, &error_flag);
1423 else if (!strcmp(key, "options.edit"))
1424 opts->edit = git_config_bool_or_int(key, value, &error_flag);
1425 else if (!strcmp(key, "options.signoff"))
1426 opts->signoff = git_config_bool_or_int(key, value, &error_flag);
1427 else if (!strcmp(key, "options.record-origin"))
1428 opts->record_origin = git_config_bool_or_int(key, value, &error_flag);
1429 else if (!strcmp(key, "options.allow-ff"))
1430 opts->allow_ff = git_config_bool_or_int(key, value, &error_flag);
1431 else if (!strcmp(key, "options.mainline"))
1432 opts->mainline = git_config_int(key, value);
1433 else if (!strcmp(key, "options.strategy"))
1434 git_config_string_dup(&opts->strategy, key, value);
1435 else if (!strcmp(key, "options.gpg-sign"))
1436 git_config_string_dup(&opts->gpg_sign, key, value);
1437 else if (!strcmp(key, "options.strategy-option")) {
1438 ALLOC_GROW(opts->xopts, opts->xopts_nr + 1, opts->xopts_alloc);
1439 opts->xopts[opts->xopts_nr++] = xstrdup(value);
1440 } else
1441 return error(_("invalid key: %s"), key);
1442
1443 if (!error_flag)
1444 return error(_("invalid value for %s: %s"), key, value);
1445
1446 return 0;
1447 }
1448
1449 static void read_strategy_opts(struct replay_opts *opts, struct strbuf *buf)
1450 {
1451 int i;
1452
1453 strbuf_reset(buf);
1454 if (!read_oneliner(buf, rebase_path_strategy(), 0))
1455 return;
1456 opts->strategy = strbuf_detach(buf, NULL);
1457 if (!read_oneliner(buf, rebase_path_strategy_opts(), 0))
1458 return;
1459
1460 opts->xopts_nr = split_cmdline(buf->buf, (const char ***)&opts->xopts);
1461 for (i = 0; i < opts->xopts_nr; i++) {
1462 const char *arg = opts->xopts[i];
1463
1464 skip_prefix(arg, "--", &arg);
1465 opts->xopts[i] = xstrdup(arg);
1466 }
1467 }
1468
1469 static int read_populate_opts(struct replay_opts *opts)
1470 {
1471 if (is_rebase_i(opts)) {
1472 struct strbuf buf = STRBUF_INIT;
1473
1474 if (read_oneliner(&buf, rebase_path_gpg_sign_opt(), 1)) {
1475 if (!starts_with(buf.buf, "-S"))
1476 strbuf_reset(&buf);
1477 else {
1478 free(opts->gpg_sign);
1479 opts->gpg_sign = xstrdup(buf.buf + 2);
1480 }
1481 }
1482
1483 if (file_exists(rebase_path_verbose()))
1484 opts->verbose = 1;
1485
1486 read_strategy_opts(opts, &buf);
1487 strbuf_release(&buf);
1488
1489 return 0;
1490 }
1491
1492 if (!file_exists(git_path_opts_file()))
1493 return 0;
1494 /*
1495 * The function git_parse_source(), called from git_config_from_file(),
1496 * may die() in case of a syntactically incorrect file. We do not care
1497 * about this case, though, because we wrote that file ourselves, so we
1498 * are pretty certain that it is syntactically correct.
1499 */
1500 if (git_config_from_file(populate_opts_cb, git_path_opts_file(), opts) < 0)
1501 return error(_("malformed options sheet: '%s'"),
1502 git_path_opts_file());
1503 return 0;
1504 }
1505
1506 static int walk_revs_populate_todo(struct todo_list *todo_list,
1507 struct replay_opts *opts)
1508 {
1509 enum todo_command command = opts->action == REPLAY_PICK ?
1510 TODO_PICK : TODO_REVERT;
1511 const char *command_string = todo_command_info[command].str;
1512 struct commit *commit;
1513
1514 if (prepare_revs(opts))
1515 return -1;
1516
1517 while ((commit = get_revision(opts->revs))) {
1518 struct todo_item *item = append_new_todo(todo_list);
1519 const char *commit_buffer = get_commit_buffer(commit, NULL);
1520 const char *subject;
1521 int subject_len;
1522
1523 item->command = command;
1524 item->commit = commit;
1525 item->arg = NULL;
1526 item->arg_len = 0;
1527 item->offset_in_buf = todo_list->buf.len;
1528 subject_len = find_commit_subject(commit_buffer, &subject);
1529 strbuf_addf(&todo_list->buf, "%s %s %.*s\n", command_string,
1530 short_commit_name(commit), subject_len, subject);
1531 unuse_commit_buffer(commit, commit_buffer);
1532 }
1533 return 0;
1534 }
1535
1536 static int create_seq_dir(void)
1537 {
1538 if (file_exists(git_path_seq_dir())) {
1539 error(_("a cherry-pick or revert is already in progress"));
1540 advise(_("try \"git cherry-pick (--continue | --quit | --abort)\""));
1541 return -1;
1542 } else if (mkdir(git_path_seq_dir(), 0777) < 0)
1543 return error_errno(_("could not create sequencer directory '%s'"),
1544 git_path_seq_dir());
1545 return 0;
1546 }
1547
1548 static int save_head(const char *head)
1549 {
1550 static struct lock_file head_lock;
1551 struct strbuf buf = STRBUF_INIT;
1552 int fd;
1553
1554 fd = hold_lock_file_for_update(&head_lock, git_path_head_file(), 0);
1555 if (fd < 0) {
1556 rollback_lock_file(&head_lock);
1557 return error_errno(_("could not lock HEAD"));
1558 }
1559 strbuf_addf(&buf, "%s\n", head);
1560 if (write_in_full(fd, buf.buf, buf.len) < 0) {
1561 rollback_lock_file(&head_lock);
1562 return error_errno(_("could not write to '%s'"),
1563 git_path_head_file());
1564 }
1565 if (commit_lock_file(&head_lock) < 0) {
1566 rollback_lock_file(&head_lock);
1567 return error(_("failed to finalize '%s'."), git_path_head_file());
1568 }
1569 return 0;
1570 }
1571
1572 static int rollback_is_safe(void)
1573 {
1574 struct strbuf sb = STRBUF_INIT;
1575 struct object_id expected_head, actual_head;
1576
1577 if (strbuf_read_file(&sb, git_path_abort_safety_file(), 0) >= 0) {
1578 strbuf_trim(&sb);
1579 if (get_oid_hex(sb.buf, &expected_head)) {
1580 strbuf_release(&sb);
1581 die(_("could not parse %s"), git_path_abort_safety_file());
1582 }
1583 strbuf_release(&sb);
1584 }
1585 else if (errno == ENOENT)
1586 oidclr(&expected_head);
1587 else
1588 die_errno(_("could not read '%s'"), git_path_abort_safety_file());
1589
1590 if (get_oid("HEAD", &actual_head))
1591 oidclr(&actual_head);
1592
1593 return !oidcmp(&actual_head, &expected_head);
1594 }
1595
1596 static int reset_for_rollback(const unsigned char *sha1)
1597 {
1598 const char *argv[4]; /* reset --merge <arg> + NULL */
1599
1600 argv[0] = "reset";
1601 argv[1] = "--merge";
1602 argv[2] = sha1_to_hex(sha1);
1603 argv[3] = NULL;
1604 return run_command_v_opt(argv, RUN_GIT_CMD);
1605 }
1606
1607 static int rollback_single_pick(void)
1608 {
1609 unsigned char head_sha1[20];
1610
1611 if (!file_exists(git_path_cherry_pick_head()) &&
1612 !file_exists(git_path_revert_head()))
1613 return error(_("no cherry-pick or revert in progress"));
1614 if (read_ref_full("HEAD", 0, head_sha1, NULL))
1615 return error(_("cannot resolve HEAD"));
1616 if (is_null_sha1(head_sha1))
1617 return error(_("cannot abort from a branch yet to be born"));
1618 return reset_for_rollback(head_sha1);
1619 }
1620
1621 int sequencer_rollback(struct replay_opts *opts)
1622 {
1623 FILE *f;
1624 unsigned char sha1[20];
1625 struct strbuf buf = STRBUF_INIT;
1626
1627 f = fopen(git_path_head_file(), "r");
1628 if (!f && errno == ENOENT) {
1629 /*
1630 * There is no multiple-cherry-pick in progress.
1631 * If CHERRY_PICK_HEAD or REVERT_HEAD indicates
1632 * a single-cherry-pick in progress, abort that.
1633 */
1634 return rollback_single_pick();
1635 }
1636 if (!f)
1637 return error_errno(_("cannot open '%s'"), git_path_head_file());
1638 if (strbuf_getline_lf(&buf, f)) {
1639 error(_("cannot read '%s': %s"), git_path_head_file(),
1640 ferror(f) ? strerror(errno) : _("unexpected end of file"));
1641 fclose(f);
1642 goto fail;
1643 }
1644 fclose(f);
1645 if (get_sha1_hex(buf.buf, sha1) || buf.buf[40] != '\0') {
1646 error(_("stored pre-cherry-pick HEAD file '%s' is corrupt"),
1647 git_path_head_file());
1648 goto fail;
1649 }
1650 if (is_null_sha1(sha1)) {
1651 error(_("cannot abort from a branch yet to be born"));
1652 goto fail;
1653 }
1654
1655 if (!rollback_is_safe()) {
1656 /* Do not error, just do not rollback */
1657 warning(_("You seem to have moved HEAD. "
1658 "Not rewinding, check your HEAD!"));
1659 } else
1660 if (reset_for_rollback(sha1))
1661 goto fail;
1662 strbuf_release(&buf);
1663 return sequencer_remove_state(opts);
1664 fail:
1665 strbuf_release(&buf);
1666 return -1;
1667 }
1668
1669 static int save_todo(struct todo_list *todo_list, struct replay_opts *opts)
1670 {
1671 static struct lock_file todo_lock;
1672 const char *todo_path = get_todo_path(opts);
1673 int next = todo_list->current, offset, fd;
1674
1675 /*
1676 * rebase -i writes "git-rebase-todo" without the currently executing
1677 * command, appending it to "done" instead.
1678 */
1679 if (is_rebase_i(opts))
1680 next++;
1681
1682 fd = hold_lock_file_for_update(&todo_lock, todo_path, 0);
1683 if (fd < 0)
1684 return error_errno(_("could not lock '%s'"), todo_path);
1685 offset = next < todo_list->nr ?
1686 todo_list->items[next].offset_in_buf : todo_list->buf.len;
1687 if (write_in_full(fd, todo_list->buf.buf + offset,
1688 todo_list->buf.len - offset) < 0)
1689 return error_errno(_("could not write to '%s'"), todo_path);
1690 if (commit_lock_file(&todo_lock) < 0)
1691 return error(_("failed to finalize '%s'."), todo_path);
1692
1693 if (is_rebase_i(opts)) {
1694 const char *done_path = rebase_path_done();
1695 int fd = open(done_path, O_CREAT | O_WRONLY | O_APPEND, 0666);
1696 int prev_offset = !next ? 0 :
1697 todo_list->items[next - 1].offset_in_buf;
1698
1699 if (fd >= 0 && offset > prev_offset &&
1700 write_in_full(fd, todo_list->buf.buf + prev_offset,
1701 offset - prev_offset) < 0) {
1702 close(fd);
1703 return error_errno(_("could not write to '%s'"),
1704 done_path);
1705 }
1706 if (fd >= 0)
1707 close(fd);
1708 }
1709 return 0;
1710 }
1711
1712 static int save_opts(struct replay_opts *opts)
1713 {
1714 const char *opts_file = git_path_opts_file();
1715 int res = 0;
1716
1717 if (opts->no_commit)
1718 res |= git_config_set_in_file_gently(opts_file, "options.no-commit", "true");
1719 if (opts->edit)
1720 res |= git_config_set_in_file_gently(opts_file, "options.edit", "true");
1721 if (opts->signoff)
1722 res |= git_config_set_in_file_gently(opts_file, "options.signoff", "true");
1723 if (opts->record_origin)
1724 res |= git_config_set_in_file_gently(opts_file, "options.record-origin", "true");
1725 if (opts->allow_ff)
1726 res |= git_config_set_in_file_gently(opts_file, "options.allow-ff", "true");
1727 if (opts->mainline) {
1728 struct strbuf buf = STRBUF_INIT;
1729 strbuf_addf(&buf, "%d", opts->mainline);
1730 res |= git_config_set_in_file_gently(opts_file, "options.mainline", buf.buf);
1731 strbuf_release(&buf);
1732 }
1733 if (opts->strategy)
1734 res |= git_config_set_in_file_gently(opts_file, "options.strategy", opts->strategy);
1735 if (opts->gpg_sign)
1736 res |= git_config_set_in_file_gently(opts_file, "options.gpg-sign", opts->gpg_sign);
1737 if (opts->xopts) {
1738 int i;
1739 for (i = 0; i < opts->xopts_nr; i++)
1740 res |= git_config_set_multivar_in_file_gently(opts_file,
1741 "options.strategy-option",
1742 opts->xopts[i], "^$", 0);
1743 }
1744 return res;
1745 }
1746
1747 static int make_patch(struct commit *commit, struct replay_opts *opts)
1748 {
1749 struct strbuf buf = STRBUF_INIT;
1750 struct rev_info log_tree_opt;
1751 const char *subject, *p;
1752 int res = 0;
1753
1754 p = short_commit_name(commit);
1755 if (write_message(p, strlen(p), rebase_path_stopped_sha(), 1) < 0)
1756 return -1;
1757
1758 strbuf_addf(&buf, "%s/patch", get_dir(opts));
1759 memset(&log_tree_opt, 0, sizeof(log_tree_opt));
1760 init_revisions(&log_tree_opt, NULL);
1761 log_tree_opt.abbrev = 0;
1762 log_tree_opt.diff = 1;
1763 log_tree_opt.diffopt.output_format = DIFF_FORMAT_PATCH;
1764 log_tree_opt.disable_stdin = 1;
1765 log_tree_opt.no_commit_id = 1;
1766 log_tree_opt.diffopt.file = fopen(buf.buf, "w");
1767 log_tree_opt.diffopt.use_color = GIT_COLOR_NEVER;
1768 if (!log_tree_opt.diffopt.file)
1769 res |= error_errno(_("could not open '%s'"), buf.buf);
1770 else {
1771 res |= log_tree_commit(&log_tree_opt, commit);
1772 fclose(log_tree_opt.diffopt.file);
1773 }
1774 strbuf_reset(&buf);
1775
1776 strbuf_addf(&buf, "%s/message", get_dir(opts));
1777 if (!file_exists(buf.buf)) {
1778 const char *commit_buffer = get_commit_buffer(commit, NULL);
1779 find_commit_subject(commit_buffer, &subject);
1780 res |= write_message(subject, strlen(subject), buf.buf, 1);
1781 unuse_commit_buffer(commit, commit_buffer);
1782 }
1783 strbuf_release(&buf);
1784
1785 return res;
1786 }
1787
1788 static int intend_to_amend(void)
1789 {
1790 unsigned char head[20];
1791 char *p;
1792
1793 if (get_sha1("HEAD", head))
1794 return error(_("cannot read HEAD"));
1795
1796 p = sha1_to_hex(head);
1797 return write_message(p, strlen(p), rebase_path_amend(), 1);
1798 }
1799
1800 static int error_with_patch(struct commit *commit,
1801 const char *subject, int subject_len,
1802 struct replay_opts *opts, int exit_code, int to_amend)
1803 {
1804 if (make_patch(commit, opts))
1805 return -1;
1806
1807 if (to_amend) {
1808 if (intend_to_amend())
1809 return -1;
1810
1811 fprintf(stderr, "You can amend the commit now, with\n"
1812 "\n"
1813 " git commit --amend %s\n"
1814 "\n"
1815 "Once you are satisfied with your changes, run\n"
1816 "\n"
1817 " git rebase --continue\n", gpg_sign_opt_quoted(opts));
1818 } else if (exit_code)
1819 fprintf(stderr, "Could not apply %s... %.*s\n",
1820 short_commit_name(commit), subject_len, subject);
1821
1822 return exit_code;
1823 }
1824
1825 static int error_failed_squash(struct commit *commit,
1826 struct replay_opts *opts, int subject_len, const char *subject)
1827 {
1828 if (rename(rebase_path_squash_msg(), rebase_path_message()))
1829 return error(_("could not rename '%s' to '%s'"),
1830 rebase_path_squash_msg(), rebase_path_message());
1831 unlink(rebase_path_fixup_msg());
1832 unlink(git_path_merge_msg());
1833 if (copy_file(git_path_merge_msg(), rebase_path_message(), 0666))
1834 return error(_("could not copy '%s' to '%s'"),
1835 rebase_path_message(), git_path_merge_msg());
1836 return error_with_patch(commit, subject, subject_len, opts, 1, 0);
1837 }
1838
1839 static int do_exec(const char *command_line)
1840 {
1841 const char *child_argv[] = { NULL, NULL };
1842 int dirty, status;
1843
1844 fprintf(stderr, "Executing: %s\n", command_line);
1845 child_argv[0] = command_line;
1846 status = run_command_v_opt(child_argv, RUN_USING_SHELL);
1847
1848 /* force re-reading of the cache */
1849 if (discard_cache() < 0 || read_cache() < 0)
1850 return error(_("could not read index"));
1851
1852 dirty = require_clean_work_tree("rebase", NULL, 1, 1);
1853
1854 if (status) {
1855 warning(_("execution failed: %s\n%s"
1856 "You can fix the problem, and then run\n"
1857 "\n"
1858 " git rebase --continue\n"
1859 "\n"),
1860 command_line,
1861 dirty ? N_("and made changes to the index and/or the "
1862 "working tree\n") : "");
1863 if (status == 127)
1864 /* command not found */
1865 status = 1;
1866 } else if (dirty) {
1867 warning(_("execution succeeded: %s\nbut "
1868 "left changes to the index and/or the working tree\n"
1869 "Commit or stash your changes, and then run\n"
1870 "\n"
1871 " git rebase --continue\n"
1872 "\n"), command_line);
1873 status = 1;
1874 }
1875
1876 return status;
1877 }
1878
1879 static int is_final_fixup(struct todo_list *todo_list)
1880 {
1881 int i = todo_list->current;
1882
1883 if (!is_fixup(todo_list->items[i].command))
1884 return 0;
1885
1886 while (++i < todo_list->nr)
1887 if (is_fixup(todo_list->items[i].command))
1888 return 0;
1889 else if (!is_noop(todo_list->items[i].command))
1890 break;
1891 return 1;
1892 }
1893
1894 static enum todo_command peek_command(struct todo_list *todo_list, int offset)
1895 {
1896 int i;
1897
1898 for (i = todo_list->current + offset; i < todo_list->nr; i++)
1899 if (!is_noop(todo_list->items[i].command))
1900 return todo_list->items[i].command;
1901
1902 return -1;
1903 }
1904
1905 static int apply_autostash(struct replay_opts *opts)
1906 {
1907 struct strbuf stash_sha1 = STRBUF_INIT;
1908 struct child_process child = CHILD_PROCESS_INIT;
1909 int ret = 0;
1910
1911 if (!read_oneliner(&stash_sha1, rebase_path_autostash(), 1)) {
1912 strbuf_release(&stash_sha1);
1913 return 0;
1914 }
1915 strbuf_trim(&stash_sha1);
1916
1917 child.git_cmd = 1;
1918 child.no_stdout = 1;
1919 child.no_stderr = 1;
1920 argv_array_push(&child.args, "stash");
1921 argv_array_push(&child.args, "apply");
1922 argv_array_push(&child.args, stash_sha1.buf);
1923 if (!run_command(&child))
1924 fprintf(stderr, _("Applied autostash.\n"));
1925 else {
1926 struct child_process store = CHILD_PROCESS_INIT;
1927
1928 store.git_cmd = 1;
1929 argv_array_push(&store.args, "stash");
1930 argv_array_push(&store.args, "store");
1931 argv_array_push(&store.args, "-m");
1932 argv_array_push(&store.args, "autostash");
1933 argv_array_push(&store.args, "-q");
1934 argv_array_push(&store.args, stash_sha1.buf);
1935 if (run_command(&store))
1936 ret = error(_("cannot store %s"), stash_sha1.buf);
1937 else
1938 fprintf(stderr,
1939 _("Applying autostash resulted in conflicts.\n"
1940 "Your changes are safe in the stash.\n"
1941 "You can run \"git stash pop\" or"
1942 " \"git stash drop\" at any time.\n"));
1943 }
1944
1945 strbuf_release(&stash_sha1);
1946 return ret;
1947 }
1948
1949 static const char *reflog_message(struct replay_opts *opts,
1950 const char *sub_action, const char *fmt, ...)
1951 {
1952 va_list ap;
1953 static struct strbuf buf = STRBUF_INIT;
1954
1955 va_start(ap, fmt);
1956 strbuf_reset(&buf);
1957 strbuf_addstr(&buf, action_name(opts));
1958 if (sub_action)
1959 strbuf_addf(&buf, " (%s)", sub_action);
1960 if (fmt) {
1961 strbuf_addstr(&buf, ": ");
1962 strbuf_vaddf(&buf, fmt, ap);
1963 }
1964 va_end(ap);
1965
1966 return buf.buf;
1967 }
1968
1969 static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
1970 {
1971 int res = 0;
1972
1973 setenv(GIT_REFLOG_ACTION, action_name(opts), 0);
1974 if (opts->allow_ff)
1975 assert(!(opts->signoff || opts->no_commit ||
1976 opts->record_origin || opts->edit));
1977 if (read_and_refresh_cache(opts))
1978 return -1;
1979
1980 while (todo_list->current < todo_list->nr) {
1981 struct todo_item *item = todo_list->items + todo_list->current;
1982 if (save_todo(todo_list, opts))
1983 return -1;
1984 if (is_rebase_i(opts)) {
1985 if (item->command != TODO_COMMENT) {
1986 FILE *f = fopen(rebase_path_msgnum(), "w");
1987
1988 todo_list->done_nr++;
1989
1990 if (f) {
1991 fprintf(f, "%d\n", todo_list->done_nr);
1992 fclose(f);
1993 }
1994 fprintf(stderr, "Rebasing (%d/%d)%s",
1995 todo_list->done_nr,
1996 todo_list->total_nr,
1997 opts->verbose ? "\n" : "\r");
1998 }
1999 unlink(rebase_path_message());
2000 unlink(rebase_path_author_script());
2001 unlink(rebase_path_stopped_sha());
2002 unlink(rebase_path_amend());
2003 }
2004 if (item->command <= TODO_SQUASH) {
2005 if (is_rebase_i(opts))
2006 setenv("GIT_REFLOG_ACTION", reflog_message(opts,
2007 command_to_string(item->command), NULL),
2008 1);
2009 res = do_pick_commit(item->command, item->commit,
2010 opts, is_final_fixup(todo_list));
2011 if (is_rebase_i(opts) && res < 0) {
2012 /* Reschedule */
2013 todo_list->current--;
2014 if (save_todo(todo_list, opts))
2015 return -1;
2016 }
2017 if (item->command == TODO_EDIT) {
2018 struct commit *commit = item->commit;
2019 if (!res)
2020 fprintf(stderr,
2021 _("Stopped at %s... %.*s\n"),
2022 short_commit_name(commit),
2023 item->arg_len, item->arg);
2024 return error_with_patch(commit,
2025 item->arg, item->arg_len, opts, res,
2026 !res);
2027 }
2028 if (is_rebase_i(opts) && !res)
2029 record_in_rewritten(&item->commit->object.oid,
2030 peek_command(todo_list, 1));
2031 if (res && is_fixup(item->command)) {
2032 if (res == 1)
2033 intend_to_amend();
2034 return error_failed_squash(item->commit, opts,
2035 item->arg_len, item->arg);
2036 } else if (res && is_rebase_i(opts))
2037 return res | error_with_patch(item->commit,
2038 item->arg, item->arg_len, opts, res,
2039 item->command == TODO_REWORD);
2040 } else if (item->command == TODO_EXEC) {
2041 char *end_of_arg = (char *)(item->arg + item->arg_len);
2042 int saved = *end_of_arg;
2043 struct stat st;
2044
2045 *end_of_arg = '\0';
2046 res = do_exec(item->arg);
2047 *end_of_arg = saved;
2048
2049 /* Reread the todo file if it has changed. */
2050 if (res)
2051 ; /* fall through */
2052 else if (stat(get_todo_path(opts), &st))
2053 res = error_errno(_("could not stat '%s'"),
2054 get_todo_path(opts));
2055 else if (match_stat_data(&todo_list->stat, &st)) {
2056 todo_list_release(todo_list);
2057 if (read_populate_todo(todo_list, opts))
2058 res = -1; /* message was printed */
2059 /* `current` will be incremented below */
2060 todo_list->current = -1;
2061 }
2062 } else if (!is_noop(item->command))
2063 return error(_("unknown command %d"), item->command);
2064
2065 todo_list->current++;
2066 if (res)
2067 return res;
2068 }
2069
2070 if (is_rebase_i(opts)) {
2071 struct strbuf head_ref = STRBUF_INIT, buf = STRBUF_INIT;
2072 struct stat st;
2073
2074 /* Stopped in the middle, as planned? */
2075 if (todo_list->current < todo_list->nr)
2076 return 0;
2077
2078 if (read_oneliner(&head_ref, rebase_path_head_name(), 0) &&
2079 starts_with(head_ref.buf, "refs/")) {
2080 const char *msg;
2081 unsigned char head[20], orig[20];
2082 int res;
2083
2084 if (get_sha1("HEAD", head)) {
2085 res = error(_("cannot read HEAD"));
2086 cleanup_head_ref:
2087 strbuf_release(&head_ref);
2088 strbuf_release(&buf);
2089 return res;
2090 }
2091 if (!read_oneliner(&buf, rebase_path_orig_head(), 0) ||
2092 get_sha1_hex(buf.buf, orig)) {
2093 res = error(_("could not read orig-head"));
2094 goto cleanup_head_ref;
2095 }
2096 strbuf_reset(&buf);
2097 if (!read_oneliner(&buf, rebase_path_onto(), 0)) {
2098 res = error(_("could not read 'onto'"));
2099 goto cleanup_head_ref;
2100 }
2101 msg = reflog_message(opts, "finish", "%s onto %s",
2102 head_ref.buf, buf.buf);
2103 if (update_ref(msg, head_ref.buf, head, orig,
2104 REF_NODEREF, UPDATE_REFS_MSG_ON_ERR)) {
2105 res = error(_("could not update %s"),
2106 head_ref.buf);
2107 goto cleanup_head_ref;
2108 }
2109 msg = reflog_message(opts, "finish", "returning to %s",
2110 head_ref.buf);
2111 if (create_symref("HEAD", head_ref.buf, msg)) {
2112 res = error(_("could not update HEAD to %s"),
2113 head_ref.buf);
2114 goto cleanup_head_ref;
2115 }
2116 strbuf_reset(&buf);
2117 }
2118
2119 if (opts->verbose) {
2120 struct rev_info log_tree_opt;
2121 struct object_id orig, head;
2122
2123 memset(&log_tree_opt, 0, sizeof(log_tree_opt));
2124 init_revisions(&log_tree_opt, NULL);
2125 log_tree_opt.diff = 1;
2126 log_tree_opt.diffopt.output_format =
2127 DIFF_FORMAT_DIFFSTAT;
2128 log_tree_opt.disable_stdin = 1;
2129
2130 if (read_oneliner(&buf, rebase_path_orig_head(), 0) &&
2131 !get_sha1(buf.buf, orig.hash) &&
2132 !get_sha1("HEAD", head.hash)) {
2133 diff_tree_sha1(orig.hash, head.hash,
2134 "", &log_tree_opt.diffopt);
2135 log_tree_diff_flush(&log_tree_opt);
2136 }
2137 }
2138 flush_rewritten_pending();
2139 if (!stat(rebase_path_rewritten_list(), &st) &&
2140 st.st_size > 0) {
2141 struct child_process child = CHILD_PROCESS_INIT;
2142 const char *post_rewrite_hook =
2143 find_hook("post-rewrite");
2144
2145 child.in = open(rebase_path_rewritten_list(), O_RDONLY);
2146 child.git_cmd = 1;
2147 argv_array_push(&child.args, "notes");
2148 argv_array_push(&child.args, "copy");
2149 argv_array_push(&child.args, "--for-rewrite=rebase");
2150 /* we don't care if this copying failed */
2151 run_command(&child);
2152
2153 if (post_rewrite_hook) {
2154 struct child_process hook = CHILD_PROCESS_INIT;
2155
2156 hook.in = open(rebase_path_rewritten_list(),
2157 O_RDONLY);
2158 hook.stdout_to_stderr = 1;
2159 argv_array_push(&hook.args, post_rewrite_hook);
2160 argv_array_push(&hook.args, "rebase");
2161 /* we don't care if this hook failed */
2162 run_command(&hook);
2163 }
2164 }
2165 apply_autostash(opts);
2166
2167 fprintf(stderr, "Successfully rebased and updated %s.\n",
2168 head_ref.buf);
2169
2170 strbuf_release(&buf);
2171 strbuf_release(&head_ref);
2172 }
2173
2174 /*
2175 * Sequence of picks finished successfully; cleanup by
2176 * removing the .git/sequencer directory
2177 */
2178 return sequencer_remove_state(opts);
2179 }
2180
2181 static int continue_single_pick(void)
2182 {
2183 const char *argv[] = { "commit", NULL };
2184
2185 if (!file_exists(git_path_cherry_pick_head()) &&
2186 !file_exists(git_path_revert_head()))
2187 return error(_("no cherry-pick or revert in progress"));
2188 return run_command_v_opt(argv, RUN_GIT_CMD);
2189 }
2190
2191 static int commit_staged_changes(struct replay_opts *opts)
2192 {
2193 unsigned int flags = ALLOW_EMPTY | EDIT_MSG;
2194
2195 if (has_unstaged_changes(1))
2196 return error(_("cannot rebase: You have unstaged changes."));
2197 if (!has_uncommitted_changes(0)) {
2198 const char *cherry_pick_head = git_path_cherry_pick_head();
2199
2200 if (file_exists(cherry_pick_head) && unlink(cherry_pick_head))
2201 return error(_("could not remove CHERRY_PICK_HEAD"));
2202 return 0;
2203 }
2204
2205 if (file_exists(rebase_path_amend())) {
2206 struct strbuf rev = STRBUF_INIT;
2207 unsigned char head[20], to_amend[20];
2208
2209 if (get_sha1("HEAD", head))
2210 return error(_("cannot amend non-existing commit"));
2211 if (!read_oneliner(&rev, rebase_path_amend(), 0))
2212 return error(_("invalid file: '%s'"), rebase_path_amend());
2213 if (get_sha1_hex(rev.buf, to_amend))
2214 return error(_("invalid contents: '%s'"),
2215 rebase_path_amend());
2216 if (hashcmp(head, to_amend))
2217 return error(_("\nYou have uncommitted changes in your "
2218 "working tree. Please, commit them\n"
2219 "first and then run 'git rebase "
2220 "--continue' again."));
2221
2222 strbuf_release(&rev);
2223 flags |= AMEND_MSG;
2224 }
2225
2226 if (run_git_commit(rebase_path_message(), opts, flags))
2227 return error(_("could not commit staged changes."));
2228 unlink(rebase_path_amend());
2229 return 0;
2230 }
2231
2232 int sequencer_continue(struct replay_opts *opts)
2233 {
2234 struct todo_list todo_list = TODO_LIST_INIT;
2235 int res;
2236
2237 if (read_and_refresh_cache(opts))
2238 return -1;
2239
2240 if (is_rebase_i(opts)) {
2241 if (commit_staged_changes(opts))
2242 return -1;
2243 } else if (!file_exists(get_todo_path(opts)))
2244 return continue_single_pick();
2245 if (read_populate_opts(opts))
2246 return -1;
2247 if ((res = read_populate_todo(&todo_list, opts)))
2248 goto release_todo_list;
2249
2250 if (!is_rebase_i(opts)) {
2251 /* Verify that the conflict has been resolved */
2252 if (file_exists(git_path_cherry_pick_head()) ||
2253 file_exists(git_path_revert_head())) {
2254 res = continue_single_pick();
2255 if (res)
2256 goto release_todo_list;
2257 }
2258 if (index_differs_from("HEAD", 0, 0)) {
2259 res = error_dirty_index(opts);
2260 goto release_todo_list;
2261 }
2262 todo_list.current++;
2263 } else if (file_exists(rebase_path_stopped_sha())) {
2264 struct strbuf buf = STRBUF_INIT;
2265 struct object_id oid;
2266
2267 if (read_oneliner(&buf, rebase_path_stopped_sha(), 1) &&
2268 !get_sha1_committish(buf.buf, oid.hash))
2269 record_in_rewritten(&oid, peek_command(&todo_list, 0));
2270 strbuf_release(&buf);
2271 }
2272
2273 res = pick_commits(&todo_list, opts);
2274 release_todo_list:
2275 todo_list_release(&todo_list);
2276 return res;
2277 }
2278
2279 static int single_pick(struct commit *cmit, struct replay_opts *opts)
2280 {
2281 setenv(GIT_REFLOG_ACTION, action_name(opts), 0);
2282 return do_pick_commit(opts->action == REPLAY_PICK ?
2283 TODO_PICK : TODO_REVERT, cmit, opts, 0);
2284 }
2285
2286 int sequencer_pick_revisions(struct replay_opts *opts)
2287 {
2288 struct todo_list todo_list = TODO_LIST_INIT;
2289 unsigned char sha1[20];
2290 int i, res;
2291
2292 assert(opts->revs);
2293 if (read_and_refresh_cache(opts))
2294 return -1;
2295
2296 for (i = 0; i < opts->revs->pending.nr; i++) {
2297 unsigned char sha1[20];
2298 const char *name = opts->revs->pending.objects[i].name;
2299
2300 /* This happens when using --stdin. */
2301 if (!strlen(name))
2302 continue;
2303
2304 if (!get_sha1(name, sha1)) {
2305 if (!lookup_commit_reference_gently(sha1, 1)) {
2306 enum object_type type = sha1_object_info(sha1, NULL);
2307 return error(_("%s: can't cherry-pick a %s"),
2308 name, typename(type));
2309 }
2310 } else
2311 return error(_("%s: bad revision"), name);
2312 }
2313
2314 /*
2315 * If we were called as "git cherry-pick <commit>", just
2316 * cherry-pick/revert it, set CHERRY_PICK_HEAD /
2317 * REVERT_HEAD, and don't touch the sequencer state.
2318 * This means it is possible to cherry-pick in the middle
2319 * of a cherry-pick sequence.
2320 */
2321 if (opts->revs->cmdline.nr == 1 &&
2322 opts->revs->cmdline.rev->whence == REV_CMD_REV &&
2323 opts->revs->no_walk &&
2324 !opts->revs->cmdline.rev->flags) {
2325 struct commit *cmit;
2326 if (prepare_revision_walk(opts->revs))
2327 return error(_("revision walk setup failed"));
2328 cmit = get_revision(opts->revs);
2329 if (!cmit || get_revision(opts->revs))
2330 return error("BUG: expected exactly one commit from walk");
2331 return single_pick(cmit, opts);
2332 }
2333
2334 /*
2335 * Start a new cherry-pick/ revert sequence; but
2336 * first, make sure that an existing one isn't in
2337 * progress
2338 */
2339
2340 if (walk_revs_populate_todo(&todo_list, opts) ||
2341 create_seq_dir() < 0)
2342 return -1;
2343 if (get_sha1("HEAD", sha1) && (opts->action == REPLAY_REVERT))
2344 return error(_("can't revert as initial commit"));
2345 if (save_head(sha1_to_hex(sha1)))
2346 return -1;
2347 if (save_opts(opts))
2348 return -1;
2349 update_abort_safety_file();
2350 res = pick_commits(&todo_list, opts);
2351 todo_list_release(&todo_list);
2352 return res;
2353 }
2354
2355 void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag)
2356 {
2357 unsigned no_dup_sob = flag & APPEND_SIGNOFF_DEDUP;
2358 struct strbuf sob = STRBUF_INIT;
2359 int has_footer;
2360
2361 strbuf_addstr(&sob, sign_off_header);
2362 strbuf_addstr(&sob, fmt_name(getenv("GIT_COMMITTER_NAME"),
2363 getenv("GIT_COMMITTER_EMAIL")));
2364 strbuf_addch(&sob, '\n');
2365
2366 if (!ignore_footer)
2367 strbuf_complete_line(msgbuf);
2368
2369 /*
2370 * If the whole message buffer is equal to the sob, pretend that we
2371 * found a conforming footer with a matching sob
2372 */
2373 if (msgbuf->len - ignore_footer == sob.len &&
2374 !strncmp(msgbuf->buf, sob.buf, sob.len))
2375 has_footer = 3;
2376 else
2377 has_footer = has_conforming_footer(msgbuf, &sob, ignore_footer);
2378
2379 if (!has_footer) {
2380 const char *append_newlines = NULL;
2381 size_t len = msgbuf->len - ignore_footer;
2382
2383 if (!len) {
2384 /*
2385 * The buffer is completely empty. Leave foom for
2386 * the title and body to be filled in by the user.
2387 */
2388 append_newlines = "\n\n";
2389 } else if (len == 1) {
2390 /*
2391 * Buffer contains a single newline. Add another
2392 * so that we leave room for the title and body.
2393 */
2394 append_newlines = "\n";
2395 } else if (msgbuf->buf[len - 2] != '\n') {
2396 /*
2397 * Buffer ends with a single newline. Add another
2398 * so that there is an empty line between the message
2399 * body and the sob.
2400 */
2401 append_newlines = "\n";
2402 } /* else, the buffer already ends with two newlines. */
2403
2404 if (append_newlines)
2405 strbuf_splice(msgbuf, msgbuf->len - ignore_footer, 0,
2406 append_newlines, strlen(append_newlines));
2407 }
2408
2409 if (has_footer != 3 && (!no_dup_sob || has_footer != 2))
2410 strbuf_splice(msgbuf, msgbuf->len - ignore_footer, 0,
2411 sob.buf, sob.len);
2412
2413 strbuf_release(&sob);
2414 }