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