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