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