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