7 #include "run-command.h"
10 #include "cache-tree.h"
14 #include "merge-recursive.h"
16 #include "argv-array.h"
18 #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
20 const char sign_off_header
[] = "Signed-off-by: ";
21 static const char cherry_picked_prefix
[] = "(cherry picked from commit ";
23 static int is_rfc2822_line(const char *buf
, int len
)
27 for (i
= 0; i
< len
; i
++) {
31 if (!isalnum(ch
) && ch
!= '-')
38 static int is_cherry_picked_from_line(const char *buf
, int len
)
41 * We only care that it looks roughly like (cherry picked from ...)
43 return len
> strlen(cherry_picked_prefix
) + 1 &&
44 starts_with(buf
, cherry_picked_prefix
) && buf
[len
- 1] == ')';
48 * Returns 0 for non-conforming footer
49 * Returns 1 for conforming footer
50 * Returns 2 when sob exists within conforming footer
51 * Returns 3 when sob exists within conforming footer as last entry
53 static int has_conforming_footer(struct strbuf
*sb
, struct strbuf
*sob
,
58 int len
= sb
->len
- ignore_footer
;
59 const char *buf
= sb
->buf
;
62 /* footer must end with newline */
63 if (!len
|| buf
[len
- 1] != '\n')
67 for (i
= len
- 1; i
> 0; i
--) {
69 if (prev
== '\n' && ch
== '\n') /* paragraph break */
74 /* require at least one blank line */
75 if (prev
!= '\n' || buf
[i
] != '\n')
78 /* advance to start of last paragraph */
79 while (i
< len
- 1 && buf
[i
] == '\n')
82 for (; i
< len
; i
= k
) {
85 for (k
= i
; k
< len
&& buf
[k
] != '\n'; k
++)
89 found_rfc2822
= is_rfc2822_line(buf
+ i
, k
- i
- 1);
90 if (found_rfc2822
&& sob
&&
91 !strncmp(buf
+ i
, sob
->buf
, sob
->len
))
94 if (!(found_rfc2822
||
95 is_cherry_picked_from_line(buf
+ i
, k
- i
- 1)))
105 static void remove_sequencer_state(void)
107 struct strbuf seq_dir
= STRBUF_INIT
;
109 strbuf_addf(&seq_dir
, "%s", git_path(SEQ_DIR
));
110 remove_dir_recursively(&seq_dir
, 0);
111 strbuf_release(&seq_dir
);
114 static const char *action_name(const struct replay_opts
*opts
)
116 return opts
->action
== REPLAY_REVERT
? "revert" : "cherry-pick";
119 struct commit_message
{
126 static int get_message(struct commit
*commit
, struct commit_message
*out
)
128 const char *abbrev
, *subject
;
129 int abbrev_len
, subject_len
;
132 if (!git_commit_encoding
)
133 git_commit_encoding
= "UTF-8";
135 out
->message
= logmsg_reencode(commit
, NULL
, git_commit_encoding
);
136 abbrev
= find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
);
137 abbrev_len
= strlen(abbrev
);
139 subject_len
= find_commit_subject(out
->message
, &subject
);
141 out
->parent_label
= xmalloc(strlen("parent of ") + abbrev_len
+
142 strlen("... ") + subject_len
+ 1);
143 q
= out
->parent_label
;
144 q
= mempcpy(q
, "parent of ", strlen("parent of "));
146 q
= mempcpy(q
, abbrev
, abbrev_len
);
147 q
= mempcpy(q
, "... ", strlen("... "));
149 q
= mempcpy(q
, subject
, subject_len
);
154 static void free_message(struct commit
*commit
, struct commit_message
*msg
)
156 free(msg
->parent_label
);
157 unuse_commit_buffer(commit
, msg
->message
);
160 static void write_cherry_pick_head(struct commit
*commit
, const char *pseudoref
)
162 const char *filename
;
164 struct strbuf buf
= STRBUF_INIT
;
166 strbuf_addf(&buf
, "%s\n", sha1_to_hex(commit
->object
.sha1
));
168 filename
= git_path("%s", pseudoref
);
169 fd
= open(filename
, O_WRONLY
| O_CREAT
, 0666);
171 die_errno(_("Could not open '%s' for writing"), filename
);
172 if (write_in_full(fd
, buf
.buf
, buf
.len
) != buf
.len
|| close(fd
))
173 die_errno(_("Could not write to '%s'"), filename
);
174 strbuf_release(&buf
);
177 static void print_advice(int show_hint
, struct replay_opts
*opts
)
179 char *msg
= getenv("GIT_CHERRY_PICK_HELP");
182 fprintf(stderr
, "%s\n", msg
);
184 * A conflict has occurred but the porcelain
185 * (typically rebase --interactive) wants to take care
186 * of the commit itself so remove CHERRY_PICK_HEAD
188 unlink(git_path("CHERRY_PICK_HEAD"));
194 advise(_("after resolving the conflicts, mark the corrected paths\n"
195 "with 'git add <paths>' or 'git rm <paths>'"));
197 advise(_("after resolving the conflicts, mark the corrected paths\n"
198 "with 'git add <paths>' or 'git rm <paths>'\n"
199 "and commit the result with 'git commit'"));
203 static void write_message(struct strbuf
*msgbuf
, const char *filename
)
205 static struct lock_file msg_file
;
207 int msg_fd
= hold_lock_file_for_update(&msg_file
, filename
,
209 if (write_in_full(msg_fd
, msgbuf
->buf
, msgbuf
->len
) < 0)
210 die_errno(_("Could not write to %s"), filename
);
211 strbuf_release(msgbuf
);
212 if (commit_lock_file(&msg_file
) < 0)
213 die(_("Error wrapping up %s"), filename
);
216 static struct tree
*empty_tree(void)
218 return lookup_tree(EMPTY_TREE_SHA1_BIN
);
221 static int error_dirty_index(struct replay_opts
*opts
)
223 if (read_cache_unmerged())
224 return error_resolve_conflict(action_name(opts
));
226 /* Different translation strings for cherry-pick and revert */
227 if (opts
->action
== REPLAY_PICK
)
228 error(_("Your local changes would be overwritten by cherry-pick."));
230 error(_("Your local changes would be overwritten by revert."));
232 if (advice_commit_before_merge
)
233 advise(_("Commit your changes or stash them to proceed."));
237 static int fast_forward_to(const unsigned char *to
, const unsigned char *from
,
238 int unborn
, struct replay_opts
*opts
)
240 struct ref_transaction
*transaction
;
241 struct strbuf sb
= STRBUF_INIT
;
242 struct strbuf err
= STRBUF_INIT
;
245 if (checkout_fast_forward(from
, to
, 1))
246 exit(128); /* the callee should have complained already */
248 strbuf_addf(&sb
, "%s: fast-forward", action_name(opts
));
250 transaction
= ref_transaction_begin(&err
);
252 ref_transaction_update(transaction
, "HEAD",
253 to
, unborn
? null_sha1
: from
,
255 ref_transaction_commit(transaction
, sb
.buf
, &err
)) {
256 ref_transaction_free(transaction
);
257 error("%s", err
.buf
);
259 strbuf_release(&err
);
264 strbuf_release(&err
);
265 ref_transaction_free(transaction
);
269 void append_conflicts_hint(struct strbuf
*msgbuf
)
273 strbuf_addch(msgbuf
, '\n');
274 strbuf_commented_addf(msgbuf
, "Conflicts:\n");
275 for (i
= 0; i
< active_nr
;) {
276 const struct cache_entry
*ce
= active_cache
[i
++];
278 strbuf_commented_addf(msgbuf
, "\t%s\n", ce
->name
);
279 while (i
< active_nr
&& !strcmp(ce
->name
,
280 active_cache
[i
]->name
))
286 static int do_recursive_merge(struct commit
*base
, struct commit
*next
,
287 const char *base_label
, const char *next_label
,
288 unsigned char *head
, struct strbuf
*msgbuf
,
289 struct replay_opts
*opts
)
291 struct merge_options o
;
292 struct tree
*result
, *next_tree
, *base_tree
, *head_tree
;
295 static struct lock_file index_lock
;
297 hold_locked_index(&index_lock
, 1);
301 init_merge_options(&o
);
302 o
.ancestor
= base
? base_label
: "(empty tree)";
304 o
.branch2
= next
? next_label
: "(empty tree)";
306 head_tree
= parse_tree_indirect(head
);
307 next_tree
= next
? next
->tree
: empty_tree();
308 base_tree
= base
? base
->tree
: empty_tree();
310 for (xopt
= opts
->xopts
; xopt
!= opts
->xopts
+ opts
->xopts_nr
; xopt
++)
311 parse_merge_opt(&o
, *xopt
);
313 clean
= merge_trees(&o
,
315 next_tree
, base_tree
, &result
);
317 if (active_cache_changed
&&
318 write_locked_index(&the_index
, &index_lock
, COMMIT_LOCK
))
319 /* TRANSLATORS: %s will be "revert" or "cherry-pick" */
320 die(_("%s: Unable to write new index file"), action_name(opts
));
321 rollback_lock_file(&index_lock
);
324 append_signoff(msgbuf
, 0, 0);
327 append_conflicts_hint(msgbuf
);
332 static int is_index_unchanged(void)
334 unsigned char head_sha1
[20];
335 struct commit
*head_commit
;
337 if (!resolve_ref_unsafe("HEAD", head_sha1
, 1, NULL
))
338 return error(_("Could not resolve HEAD commit\n"));
340 head_commit
= lookup_commit(head_sha1
);
343 * If head_commit is NULL, check_commit, called from
344 * lookup_commit, would have indicated that head_commit is not
345 * a commit object already. parse_commit() will return failure
346 * without further complaints in such a case. Otherwise, if
347 * the commit is invalid, parse_commit() will complain. So
348 * there is nothing for us to say here. Just return failure.
350 if (parse_commit(head_commit
))
353 if (!active_cache_tree
)
354 active_cache_tree
= cache_tree();
356 if (!cache_tree_fully_valid(active_cache_tree
))
357 if (cache_tree_update(&the_index
, 0))
358 return error(_("Unable to update cache tree\n"));
360 return !hashcmp(active_cache_tree
->sha1
, head_commit
->tree
->object
.sha1
);
364 * If we are cherry-pick, and if the merge did not result in
365 * hand-editing, we will hit this commit and inherit the original
366 * author date and name.
367 * If we are revert, or if our cherry-pick results in a hand merge,
368 * we had better say that the current user is responsible for that.
370 static int run_git_commit(const char *defmsg
, struct replay_opts
*opts
,
373 struct argv_array array
;
376 argv_array_init(&array
);
377 argv_array_push(&array
, "commit");
378 argv_array_push(&array
, "-n");
381 argv_array_pushf(&array
, "-S%s", opts
->gpg_sign
);
383 argv_array_push(&array
, "-s");
385 argv_array_push(&array
, "-F");
386 argv_array_push(&array
, defmsg
);
390 argv_array_push(&array
, "--allow-empty");
392 if (opts
->allow_empty_message
)
393 argv_array_push(&array
, "--allow-empty-message");
395 rc
= run_command_v_opt(array
.argv
, RUN_GIT_CMD
);
396 argv_array_clear(&array
);
400 static int is_original_commit_empty(struct commit
*commit
)
402 const unsigned char *ptree_sha1
;
404 if (parse_commit(commit
))
405 return error(_("Could not parse commit %s\n"),
406 sha1_to_hex(commit
->object
.sha1
));
407 if (commit
->parents
) {
408 struct commit
*parent
= commit
->parents
->item
;
409 if (parse_commit(parent
))
410 return error(_("Could not parse parent commit %s\n"),
411 sha1_to_hex(parent
->object
.sha1
));
412 ptree_sha1
= parent
->tree
->object
.sha1
;
414 ptree_sha1
= EMPTY_TREE_SHA1_BIN
; /* commit is root */
417 return !hashcmp(ptree_sha1
, commit
->tree
->object
.sha1
);
421 * Do we run "git commit" with "--allow-empty"?
423 static int allow_empty(struct replay_opts
*opts
, struct commit
*commit
)
425 int index_unchanged
, empty_commit
;
430 * (1) we do not allow empty at all and error out.
432 * (2) we allow ones that were initially empty, but
433 * forbid the ones that become empty;
437 if (!opts
->allow_empty
)
438 return 0; /* let "git commit" barf as necessary */
440 index_unchanged
= is_index_unchanged();
441 if (index_unchanged
< 0)
442 return index_unchanged
;
443 if (!index_unchanged
)
444 return 0; /* we do not have to say --allow-empty */
446 if (opts
->keep_redundant_commits
)
449 empty_commit
= is_original_commit_empty(commit
);
450 if (empty_commit
< 0)
458 static int do_pick_commit(struct commit
*commit
, struct replay_opts
*opts
)
460 unsigned char head
[20];
461 struct commit
*base
, *next
, *parent
;
462 const char *base_label
, *next_label
;
463 struct commit_message msg
= { NULL
, NULL
, NULL
, NULL
};
465 struct strbuf msgbuf
= STRBUF_INIT
;
466 int res
, unborn
= 0, allow
;
468 if (opts
->no_commit
) {
470 * We do not intend to commit immediately. We just want to
471 * merge the differences in, so let's compute the tree
472 * that represents the "current" state for merge-recursive
475 if (write_cache_as_tree(head
, 0, NULL
))
476 die (_("Your index file is unmerged."));
478 unborn
= get_sha1("HEAD", head
);
480 hashcpy(head
, EMPTY_TREE_SHA1_BIN
);
481 if (index_differs_from(unborn
? EMPTY_TREE_SHA1_HEX
: "HEAD", 0))
482 return error_dirty_index(opts
);
486 if (!commit
->parents
) {
489 else if (commit
->parents
->next
) {
490 /* Reverting or cherry-picking a merge commit */
492 struct commit_list
*p
;
495 return error(_("Commit %s is a merge but no -m option was given."),
496 sha1_to_hex(commit
->object
.sha1
));
498 for (cnt
= 1, p
= commit
->parents
;
499 cnt
!= opts
->mainline
&& p
;
502 if (cnt
!= opts
->mainline
|| !p
)
503 return error(_("Commit %s does not have parent %d"),
504 sha1_to_hex(commit
->object
.sha1
), opts
->mainline
);
506 } else if (0 < opts
->mainline
)
507 return error(_("Mainline was specified but commit %s is not a merge."),
508 sha1_to_hex(commit
->object
.sha1
));
510 parent
= commit
->parents
->item
;
512 if (opts
->allow_ff
&&
513 ((parent
&& !hashcmp(parent
->object
.sha1
, head
)) ||
514 (!parent
&& unborn
)))
515 return fast_forward_to(commit
->object
.sha1
, head
, unborn
, opts
);
517 if (parent
&& parse_commit(parent
) < 0)
518 /* TRANSLATORS: The first %s will be "revert" or
519 "cherry-pick", the second %s a SHA1 */
520 return error(_("%s: cannot parse parent commit %s"),
521 action_name(opts
), sha1_to_hex(parent
->object
.sha1
));
523 if (get_message(commit
, &msg
) != 0)
524 return error(_("Cannot get commit message for %s"),
525 sha1_to_hex(commit
->object
.sha1
));
528 * "commit" is an existing commit. We would want to apply
529 * the difference it introduces since its first parent "prev"
530 * on top of the current HEAD if we are cherry-pick. Or the
531 * reverse of it if we are revert.
534 defmsg
= git_pathdup("MERGE_MSG");
536 if (opts
->action
== REPLAY_REVERT
) {
538 base_label
= msg
.label
;
540 next_label
= msg
.parent_label
;
541 strbuf_addstr(&msgbuf
, "Revert \"");
542 strbuf_addstr(&msgbuf
, msg
.subject
);
543 strbuf_addstr(&msgbuf
, "\"\n\nThis reverts commit ");
544 strbuf_addstr(&msgbuf
, sha1_to_hex(commit
->object
.sha1
));
546 if (commit
->parents
&& commit
->parents
->next
) {
547 strbuf_addstr(&msgbuf
, ", reversing\nchanges made to ");
548 strbuf_addstr(&msgbuf
, sha1_to_hex(parent
->object
.sha1
));
550 strbuf_addstr(&msgbuf
, ".\n");
555 base_label
= msg
.parent_label
;
557 next_label
= msg
.label
;
560 * Append the commit log message to msgbuf; it starts
561 * after the tree, parent, author, committer
562 * information followed by "\n\n".
564 p
= strstr(msg
.message
, "\n\n");
567 strbuf_addstr(&msgbuf
, p
);
570 if (opts
->record_origin
) {
571 if (!has_conforming_footer(&msgbuf
, NULL
, 0))
572 strbuf_addch(&msgbuf
, '\n');
573 strbuf_addstr(&msgbuf
, cherry_picked_prefix
);
574 strbuf_addstr(&msgbuf
, sha1_to_hex(commit
->object
.sha1
));
575 strbuf_addstr(&msgbuf
, ")\n");
579 if (!opts
->strategy
|| !strcmp(opts
->strategy
, "recursive") || opts
->action
== REPLAY_REVERT
) {
580 res
= do_recursive_merge(base
, next
, base_label
, next_label
,
581 head
, &msgbuf
, opts
);
582 write_message(&msgbuf
, defmsg
);
584 struct commit_list
*common
= NULL
;
585 struct commit_list
*remotes
= NULL
;
587 write_message(&msgbuf
, defmsg
);
589 commit_list_insert(base
, &common
);
590 commit_list_insert(next
, &remotes
);
591 res
= try_merge_command(opts
->strategy
, opts
->xopts_nr
, opts
->xopts
,
592 common
, sha1_to_hex(head
), remotes
);
593 free_commit_list(common
);
594 free_commit_list(remotes
);
598 * If the merge was clean or if it failed due to conflict, we write
599 * CHERRY_PICK_HEAD for the subsequent invocation of commit to use.
600 * However, if the merge did not even start, then we don't want to
603 if (opts
->action
== REPLAY_PICK
&& !opts
->no_commit
&& (res
== 0 || res
== 1))
604 write_cherry_pick_head(commit
, "CHERRY_PICK_HEAD");
605 if (opts
->action
== REPLAY_REVERT
&& ((opts
->no_commit
&& res
== 0) || res
== 1))
606 write_cherry_pick_head(commit
, "REVERT_HEAD");
609 error(opts
->action
== REPLAY_REVERT
610 ? _("could not revert %s... %s")
611 : _("could not apply %s... %s"),
612 find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
),
614 print_advice(res
== 1, opts
);
615 rerere(opts
->allow_rerere_auto
);
619 allow
= allow_empty(opts
, commit
);
624 if (!opts
->no_commit
)
625 res
= run_git_commit(defmsg
, opts
, allow
);
628 free_message(commit
, &msg
);
634 static void prepare_revs(struct replay_opts
*opts
)
637 * picking (but not reverting) ranges (but not individual revisions)
638 * should be done in reverse
640 if (opts
->action
== REPLAY_PICK
&& !opts
->revs
->no_walk
)
641 opts
->revs
->reverse
^= 1;
643 if (prepare_revision_walk(opts
->revs
))
644 die(_("revision walk setup failed"));
646 if (!opts
->revs
->commits
)
647 die(_("empty commit set passed"));
650 static void read_and_refresh_cache(struct replay_opts
*opts
)
652 static struct lock_file index_lock
;
653 int index_fd
= hold_locked_index(&index_lock
, 0);
654 if (read_index_preload(&the_index
, NULL
) < 0)
655 die(_("git %s: failed to read the index"), action_name(opts
));
656 refresh_index(&the_index
, REFRESH_QUIET
|REFRESH_UNMERGED
, NULL
, NULL
, NULL
);
657 if (the_index
.cache_changed
&& index_fd
>= 0) {
658 if (write_locked_index(&the_index
, &index_lock
, COMMIT_LOCK
))
659 die(_("git %s: failed to refresh the index"), action_name(opts
));
661 rollback_lock_file(&index_lock
);
664 static int format_todo(struct strbuf
*buf
, struct commit_list
*todo_list
,
665 struct replay_opts
*opts
)
667 struct commit_list
*cur
= NULL
;
668 const char *sha1_abbrev
= NULL
;
669 const char *action_str
= opts
->action
== REPLAY_REVERT
? "revert" : "pick";
673 for (cur
= todo_list
; cur
; cur
= cur
->next
) {
674 const char *commit_buffer
= get_commit_buffer(cur
->item
, NULL
);
675 sha1_abbrev
= find_unique_abbrev(cur
->item
->object
.sha1
, DEFAULT_ABBREV
);
676 subject_len
= find_commit_subject(commit_buffer
, &subject
);
677 strbuf_addf(buf
, "%s %s %.*s\n", action_str
, sha1_abbrev
,
678 subject_len
, subject
);
679 unuse_commit_buffer(cur
->item
, commit_buffer
);
684 static struct commit
*parse_insn_line(char *bol
, char *eol
, struct replay_opts
*opts
)
686 unsigned char commit_sha1
[20];
687 enum replay_action action
;
688 char *end_of_object_name
;
689 int saved
, status
, padding
;
691 if (starts_with(bol
, "pick")) {
692 action
= REPLAY_PICK
;
693 bol
+= strlen("pick");
694 } else if (starts_with(bol
, "revert")) {
695 action
= REPLAY_REVERT
;
696 bol
+= strlen("revert");
700 /* Eat up extra spaces/ tabs before object name */
701 padding
= strspn(bol
, " \t");
706 end_of_object_name
= bol
+ strcspn(bol
, " \t\n");
707 saved
= *end_of_object_name
;
708 *end_of_object_name
= '\0';
709 status
= get_sha1(bol
, commit_sha1
);
710 *end_of_object_name
= saved
;
713 * Verify that the action matches up with the one in
714 * opts; we don't support arbitrary instructions
716 if (action
!= opts
->action
) {
717 const char *action_str
;
718 action_str
= action
== REPLAY_REVERT
? "revert" : "cherry-pick";
719 error(_("Cannot %s during a %s"), action_str
, action_name(opts
));
726 return lookup_commit_reference(commit_sha1
);
729 static int parse_insn_buffer(char *buf
, struct commit_list
**todo_list
,
730 struct replay_opts
*opts
)
732 struct commit_list
**next
= todo_list
;
733 struct commit
*commit
;
737 for (i
= 1; *p
; i
++) {
738 char *eol
= strchrnul(p
, '\n');
739 commit
= parse_insn_line(p
, eol
, opts
);
741 return error(_("Could not parse line %d."), i
);
742 next
= commit_list_append(commit
, next
);
743 p
= *eol
? eol
+ 1 : eol
;
746 return error(_("No commits parsed."));
750 static void read_populate_todo(struct commit_list
**todo_list
,
751 struct replay_opts
*opts
)
753 const char *todo_file
= git_path(SEQ_TODO_FILE
);
754 struct strbuf buf
= STRBUF_INIT
;
757 fd
= open(todo_file
, O_RDONLY
);
759 die_errno(_("Could not open %s"), todo_file
);
760 if (strbuf_read(&buf
, fd
, 0) < 0) {
762 strbuf_release(&buf
);
763 die(_("Could not read %s."), todo_file
);
767 res
= parse_insn_buffer(buf
.buf
, todo_list
, opts
);
768 strbuf_release(&buf
);
770 die(_("Unusable instruction sheet: %s"), todo_file
);
773 static int populate_opts_cb(const char *key
, const char *value
, void *data
)
775 struct replay_opts
*opts
= data
;
780 else if (!strcmp(key
, "options.no-commit"))
781 opts
->no_commit
= git_config_bool_or_int(key
, value
, &error_flag
);
782 else if (!strcmp(key
, "options.edit"))
783 opts
->edit
= git_config_bool_or_int(key
, value
, &error_flag
);
784 else if (!strcmp(key
, "options.signoff"))
785 opts
->signoff
= git_config_bool_or_int(key
, value
, &error_flag
);
786 else if (!strcmp(key
, "options.record-origin"))
787 opts
->record_origin
= git_config_bool_or_int(key
, value
, &error_flag
);
788 else if (!strcmp(key
, "options.allow-ff"))
789 opts
->allow_ff
= git_config_bool_or_int(key
, value
, &error_flag
);
790 else if (!strcmp(key
, "options.mainline"))
791 opts
->mainline
= git_config_int(key
, value
);
792 else if (!strcmp(key
, "options.strategy"))
793 git_config_string(&opts
->strategy
, key
, value
);
794 else if (!strcmp(key
, "options.gpg-sign"))
795 git_config_string(&opts
->gpg_sign
, key
, value
);
796 else if (!strcmp(key
, "options.strategy-option")) {
797 ALLOC_GROW(opts
->xopts
, opts
->xopts_nr
+ 1, opts
->xopts_alloc
);
798 opts
->xopts
[opts
->xopts_nr
++] = xstrdup(value
);
800 return error(_("Invalid key: %s"), key
);
803 return error(_("Invalid value for %s: %s"), key
, value
);
808 static void read_populate_opts(struct replay_opts
**opts_ptr
)
810 const char *opts_file
= git_path(SEQ_OPTS_FILE
);
812 if (!file_exists(opts_file
))
814 if (git_config_from_file(populate_opts_cb
, opts_file
, *opts_ptr
) < 0)
815 die(_("Malformed options sheet: %s"), opts_file
);
818 static void walk_revs_populate_todo(struct commit_list
**todo_list
,
819 struct replay_opts
*opts
)
821 struct commit
*commit
;
822 struct commit_list
**next
;
827 while ((commit
= get_revision(opts
->revs
)))
828 next
= commit_list_append(commit
, next
);
831 static int create_seq_dir(void)
833 const char *seq_dir
= git_path(SEQ_DIR
);
835 if (file_exists(seq_dir
)) {
836 error(_("a cherry-pick or revert is already in progress"));
837 advise(_("try \"git cherry-pick (--continue | --quit | --abort)\""));
840 else if (mkdir(seq_dir
, 0777) < 0)
841 die_errno(_("Could not create sequencer directory %s"), seq_dir
);
845 static void save_head(const char *head
)
847 const char *head_file
= git_path(SEQ_HEAD_FILE
);
848 static struct lock_file head_lock
;
849 struct strbuf buf
= STRBUF_INIT
;
852 fd
= hold_lock_file_for_update(&head_lock
, head_file
, LOCK_DIE_ON_ERROR
);
853 strbuf_addf(&buf
, "%s\n", head
);
854 if (write_in_full(fd
, buf
.buf
, buf
.len
) < 0)
855 die_errno(_("Could not write to %s"), head_file
);
856 if (commit_lock_file(&head_lock
) < 0)
857 die(_("Error wrapping up %s."), head_file
);
860 static int reset_for_rollback(const unsigned char *sha1
)
862 const char *argv
[4]; /* reset --merge <arg> + NULL */
865 argv
[2] = sha1_to_hex(sha1
);
867 return run_command_v_opt(argv
, RUN_GIT_CMD
);
870 static int rollback_single_pick(void)
872 unsigned char head_sha1
[20];
874 if (!file_exists(git_path("CHERRY_PICK_HEAD")) &&
875 !file_exists(git_path("REVERT_HEAD")))
876 return error(_("no cherry-pick or revert in progress"));
877 if (read_ref_full("HEAD", head_sha1
, 0, NULL
))
878 return error(_("cannot resolve HEAD"));
879 if (is_null_sha1(head_sha1
))
880 return error(_("cannot abort from a branch yet to be born"));
881 return reset_for_rollback(head_sha1
);
884 static int sequencer_rollback(struct replay_opts
*opts
)
886 const char *filename
;
888 unsigned char sha1
[20];
889 struct strbuf buf
= STRBUF_INIT
;
891 filename
= git_path(SEQ_HEAD_FILE
);
892 f
= fopen(filename
, "r");
893 if (!f
&& errno
== ENOENT
) {
895 * There is no multiple-cherry-pick in progress.
896 * If CHERRY_PICK_HEAD or REVERT_HEAD indicates
897 * a single-cherry-pick in progress, abort that.
899 return rollback_single_pick();
902 return error(_("cannot open %s: %s"), filename
,
904 if (strbuf_getline(&buf
, f
, '\n')) {
905 error(_("cannot read %s: %s"), filename
, ferror(f
) ?
906 strerror(errno
) : _("unexpected end of file"));
911 if (get_sha1_hex(buf
.buf
, sha1
) || buf
.buf
[40] != '\0') {
912 error(_("stored pre-cherry-pick HEAD file '%s' is corrupt"),
916 if (reset_for_rollback(sha1
))
918 remove_sequencer_state();
919 strbuf_release(&buf
);
922 strbuf_release(&buf
);
926 static void save_todo(struct commit_list
*todo_list
, struct replay_opts
*opts
)
928 const char *todo_file
= git_path(SEQ_TODO_FILE
);
929 static struct lock_file todo_lock
;
930 struct strbuf buf
= STRBUF_INIT
;
933 fd
= hold_lock_file_for_update(&todo_lock
, todo_file
, LOCK_DIE_ON_ERROR
);
934 if (format_todo(&buf
, todo_list
, opts
) < 0)
935 die(_("Could not format %s."), todo_file
);
936 if (write_in_full(fd
, buf
.buf
, buf
.len
) < 0) {
937 strbuf_release(&buf
);
938 die_errno(_("Could not write to %s"), todo_file
);
940 if (commit_lock_file(&todo_lock
) < 0) {
941 strbuf_release(&buf
);
942 die(_("Error wrapping up %s."), todo_file
);
944 strbuf_release(&buf
);
947 static void save_opts(struct replay_opts
*opts
)
949 const char *opts_file
= git_path(SEQ_OPTS_FILE
);
952 git_config_set_in_file(opts_file
, "options.no-commit", "true");
954 git_config_set_in_file(opts_file
, "options.edit", "true");
956 git_config_set_in_file(opts_file
, "options.signoff", "true");
957 if (opts
->record_origin
)
958 git_config_set_in_file(opts_file
, "options.record-origin", "true");
960 git_config_set_in_file(opts_file
, "options.allow-ff", "true");
961 if (opts
->mainline
) {
962 struct strbuf buf
= STRBUF_INIT
;
963 strbuf_addf(&buf
, "%d", opts
->mainline
);
964 git_config_set_in_file(opts_file
, "options.mainline", buf
.buf
);
965 strbuf_release(&buf
);
968 git_config_set_in_file(opts_file
, "options.strategy", opts
->strategy
);
970 git_config_set_in_file(opts_file
, "options.gpg-sign", opts
->gpg_sign
);
973 for (i
= 0; i
< opts
->xopts_nr
; i
++)
974 git_config_set_multivar_in_file(opts_file
,
975 "options.strategy-option",
976 opts
->xopts
[i
], "^$", 0);
980 static int pick_commits(struct commit_list
*todo_list
, struct replay_opts
*opts
)
982 struct commit_list
*cur
;
985 setenv(GIT_REFLOG_ACTION
, action_name(opts
), 0);
987 assert(!(opts
->signoff
|| opts
->no_commit
||
988 opts
->record_origin
|| opts
->edit
));
989 read_and_refresh_cache(opts
);
991 for (cur
= todo_list
; cur
; cur
= cur
->next
) {
992 save_todo(cur
, opts
);
993 res
= do_pick_commit(cur
->item
, opts
);
999 * Sequence of picks finished successfully; cleanup by
1000 * removing the .git/sequencer directory
1002 remove_sequencer_state();
1006 static int continue_single_pick(void)
1008 const char *argv
[] = { "commit", NULL
};
1010 if (!file_exists(git_path("CHERRY_PICK_HEAD")) &&
1011 !file_exists(git_path("REVERT_HEAD")))
1012 return error(_("no cherry-pick or revert in progress"));
1013 return run_command_v_opt(argv
, RUN_GIT_CMD
);
1016 static int sequencer_continue(struct replay_opts
*opts
)
1018 struct commit_list
*todo_list
= NULL
;
1020 if (!file_exists(git_path(SEQ_TODO_FILE
)))
1021 return continue_single_pick();
1022 read_populate_opts(&opts
);
1023 read_populate_todo(&todo_list
, opts
);
1025 /* Verify that the conflict has been resolved */
1026 if (file_exists(git_path("CHERRY_PICK_HEAD")) ||
1027 file_exists(git_path("REVERT_HEAD"))) {
1028 int ret
= continue_single_pick();
1032 if (index_differs_from("HEAD", 0))
1033 return error_dirty_index(opts
);
1034 todo_list
= todo_list
->next
;
1035 return pick_commits(todo_list
, opts
);
1038 static int single_pick(struct commit
*cmit
, struct replay_opts
*opts
)
1040 setenv(GIT_REFLOG_ACTION
, action_name(opts
), 0);
1041 return do_pick_commit(cmit
, opts
);
1044 int sequencer_pick_revisions(struct replay_opts
*opts
)
1046 struct commit_list
*todo_list
= NULL
;
1047 unsigned char sha1
[20];
1050 if (opts
->subcommand
== REPLAY_NONE
)
1053 read_and_refresh_cache(opts
);
1056 * Decide what to do depending on the arguments; a fresh
1057 * cherry-pick should be handled differently from an existing
1058 * one that is being continued
1060 if (opts
->subcommand
== REPLAY_REMOVE_STATE
) {
1061 remove_sequencer_state();
1064 if (opts
->subcommand
== REPLAY_ROLLBACK
)
1065 return sequencer_rollback(opts
);
1066 if (opts
->subcommand
== REPLAY_CONTINUE
)
1067 return sequencer_continue(opts
);
1069 for (i
= 0; i
< opts
->revs
->pending
.nr
; i
++) {
1070 unsigned char sha1
[20];
1071 const char *name
= opts
->revs
->pending
.objects
[i
].name
;
1073 /* This happens when using --stdin. */
1077 if (!get_sha1(name
, sha1
)) {
1078 if (!lookup_commit_reference_gently(sha1
, 1)) {
1079 enum object_type type
= sha1_object_info(sha1
, NULL
);
1080 die(_("%s: can't cherry-pick a %s"), name
, typename(type
));
1083 die(_("%s: bad revision"), name
);
1087 * If we were called as "git cherry-pick <commit>", just
1088 * cherry-pick/revert it, set CHERRY_PICK_HEAD /
1089 * REVERT_HEAD, and don't touch the sequencer state.
1090 * This means it is possible to cherry-pick in the middle
1091 * of a cherry-pick sequence.
1093 if (opts
->revs
->cmdline
.nr
== 1 &&
1094 opts
->revs
->cmdline
.rev
->whence
== REV_CMD_REV
&&
1095 opts
->revs
->no_walk
&&
1096 !opts
->revs
->cmdline
.rev
->flags
) {
1097 struct commit
*cmit
;
1098 if (prepare_revision_walk(opts
->revs
))
1099 die(_("revision walk setup failed"));
1100 cmit
= get_revision(opts
->revs
);
1101 if (!cmit
|| get_revision(opts
->revs
))
1102 die("BUG: expected exactly one commit from walk");
1103 return single_pick(cmit
, opts
);
1107 * Start a new cherry-pick/ revert sequence; but
1108 * first, make sure that an existing one isn't in
1112 walk_revs_populate_todo(&todo_list
, opts
);
1113 if (create_seq_dir() < 0)
1115 if (get_sha1("HEAD", sha1
)) {
1116 if (opts
->action
== REPLAY_REVERT
)
1117 return error(_("Can't revert as initial commit"));
1118 return error(_("Can't cherry-pick into empty head"));
1120 save_head(sha1_to_hex(sha1
));
1122 return pick_commits(todo_list
, opts
);
1125 void append_signoff(struct strbuf
*msgbuf
, int ignore_footer
, unsigned flag
)
1127 unsigned no_dup_sob
= flag
& APPEND_SIGNOFF_DEDUP
;
1128 struct strbuf sob
= STRBUF_INIT
;
1131 strbuf_addstr(&sob
, sign_off_header
);
1132 strbuf_addstr(&sob
, fmt_name(getenv("GIT_COMMITTER_NAME"),
1133 getenv("GIT_COMMITTER_EMAIL")));
1134 strbuf_addch(&sob
, '\n');
1137 * If the whole message buffer is equal to the sob, pretend that we
1138 * found a conforming footer with a matching sob
1140 if (msgbuf
->len
- ignore_footer
== sob
.len
&&
1141 !strncmp(msgbuf
->buf
, sob
.buf
, sob
.len
))
1144 has_footer
= has_conforming_footer(msgbuf
, &sob
, ignore_footer
);
1147 const char *append_newlines
= NULL
;
1148 size_t len
= msgbuf
->len
- ignore_footer
;
1152 * The buffer is completely empty. Leave foom for
1153 * the title and body to be filled in by the user.
1155 append_newlines
= "\n\n";
1156 } else if (msgbuf
->buf
[len
- 1] != '\n') {
1158 * Incomplete line. Complete the line and add a
1159 * blank one so that there is an empty line between
1160 * the message body and the sob.
1162 append_newlines
= "\n\n";
1163 } else if (len
== 1) {
1165 * Buffer contains a single newline. Add another
1166 * so that we leave room for the title and body.
1168 append_newlines
= "\n";
1169 } else if (msgbuf
->buf
[len
- 2] != '\n') {
1171 * Buffer ends with a single newline. Add another
1172 * so that there is an empty line between the message
1175 append_newlines
= "\n";
1176 } /* else, the buffer already ends with two newlines. */
1178 if (append_newlines
)
1179 strbuf_splice(msgbuf
, msgbuf
->len
- ignore_footer
, 0,
1180 append_newlines
, strlen(append_newlines
));
1183 if (has_footer
!= 3 && (!no_dup_sob
|| has_footer
!= 2))
1184 strbuf_splice(msgbuf
, msgbuf
->len
- ignore_footer
, 0,
1187 strbuf_release(&sob
);