6 #include "run-command.h"
9 #include "parse-options.h"
10 #include "cache-tree.h"
14 #include "merge-recursive.h"
17 #include "sequencer.h"
20 * This implements the builtins revert and cherry-pick.
22 * Copyright (c) 2007 Johannes E. Schindelin
24 * Based on git-revert.sh, which is
26 * Copyright (c) 2005 Linus Torvalds
27 * Copyright (c) 2005 Junio C Hamano
30 static const char * const revert_usage
[] = {
31 "git revert [options] <commit-ish>",
32 "git revert <subcommand>",
36 static const char * const cherry_pick_usage
[] = {
37 "git cherry-pick [options] <commit-ish>",
38 "git cherry-pick <subcommand>",
42 enum replay_action
{ REVERT
, CHERRY_PICK
};
43 enum replay_subcommand
{ REPLAY_NONE
, REPLAY_RESET
};
46 enum replay_action action
;
47 enum replay_subcommand subcommand
;
55 int allow_rerere_auto
;
59 const char **commit_argv
;
64 size_t xopts_nr
, xopts_alloc
;
67 #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
69 static const char *action_name(const struct replay_opts
*opts
)
71 return opts
->action
== REVERT
? "revert" : "cherry-pick";
74 static char *get_encoding(const char *message
);
76 static const char * const *revert_or_cherry_pick_usage(struct replay_opts
*opts
)
78 return opts
->action
== REVERT
? revert_usage
: cherry_pick_usage
;
81 static int option_parse_x(const struct option
*opt
,
82 const char *arg
, int unset
)
84 struct replay_opts
**opts_ptr
= opt
->value
;
85 struct replay_opts
*opts
= *opts_ptr
;
90 ALLOC_GROW(opts
->xopts
, opts
->xopts_nr
+ 1, opts
->xopts_alloc
);
91 opts
->xopts
[opts
->xopts_nr
++] = xstrdup(arg
);
95 static void verify_opt_compatible(const char *me
, const char *base_opt
, ...)
100 va_start(ap
, base_opt
);
101 while ((this_opt
= va_arg(ap
, const char *))) {
108 die(_("%s: %s cannot be used with %s"), me
, this_opt
, base_opt
);
111 static void parse_args(int argc
, const char **argv
, struct replay_opts
*opts
)
113 const char * const * usage_str
= revert_or_cherry_pick_usage(opts
);
114 const char *me
= action_name(opts
);
117 struct option options
[] = {
118 OPT_BOOLEAN(0, "reset", &reset
, "forget the current operation"),
119 OPT_BOOLEAN('n', "no-commit", &opts
->no_commit
, "don't automatically commit"),
120 OPT_BOOLEAN('e', "edit", &opts
->edit
, "edit the commit message"),
121 { OPTION_BOOLEAN
, 'r', NULL
, &noop
, NULL
, "no-op (backward compatibility)",
122 PARSE_OPT_NOARG
| PARSE_OPT_HIDDEN
, NULL
, 0 },
123 OPT_BOOLEAN('s', "signoff", &opts
->signoff
, "add Signed-off-by:"),
124 OPT_INTEGER('m', "mainline", &opts
->mainline
, "parent number"),
125 OPT_RERERE_AUTOUPDATE(&opts
->allow_rerere_auto
),
126 OPT_STRING(0, "strategy", &opts
->strategy
, "strategy", "merge strategy"),
127 OPT_CALLBACK('X', "strategy-option", &opts
, "option",
128 "option for merge strategy", option_parse_x
),
134 if (opts
->action
== CHERRY_PICK
) {
135 struct option cp_extra
[] = {
136 OPT_BOOLEAN('x', NULL
, &opts
->record_origin
, "append commit name"),
137 OPT_BOOLEAN(0, "ff", &opts
->allow_ff
, "allow fast-forward"),
140 if (parse_options_concat(options
, ARRAY_SIZE(options
), cp_extra
))
141 die(_("program error"));
144 opts
->commit_argc
= parse_options(argc
, argv
, NULL
, options
, usage_str
,
145 PARSE_OPT_KEEP_ARGV0
|
146 PARSE_OPT_KEEP_UNKNOWN
);
148 /* Set the subcommand */
150 opts
->subcommand
= REPLAY_RESET
;
152 opts
->subcommand
= REPLAY_NONE
;
154 /* Check for incompatible command line arguments */
155 if (opts
->subcommand
== REPLAY_RESET
) {
156 verify_opt_compatible(me
, "--reset",
157 "--no-commit", opts
->no_commit
,
158 "--signoff", opts
->signoff
,
159 "--mainline", opts
->mainline
,
160 "--strategy", opts
->strategy
? 1 : 0,
161 "--strategy-option", opts
->xopts
? 1 : 0,
162 "-x", opts
->record_origin
,
163 "--ff", opts
->allow_ff
,
167 else if (opts
->commit_argc
< 2)
168 usage_with_options(usage_str
, options
);
171 verify_opt_compatible(me
, "--ff",
172 "--signoff", opts
->signoff
,
173 "--no-commit", opts
->no_commit
,
174 "-x", opts
->record_origin
,
175 "--edit", opts
->edit
,
177 opts
->commit_argv
= argv
;
180 struct commit_message
{
184 char *reencoded_message
;
188 static int get_message(struct commit
*commit
, struct commit_message
*out
)
190 const char *encoding
;
191 const char *abbrev
, *subject
;
192 int abbrev_len
, subject_len
;
197 encoding
= get_encoding(commit
->buffer
);
200 if (!git_commit_encoding
)
201 git_commit_encoding
= "UTF-8";
203 out
->reencoded_message
= NULL
;
204 out
->message
= commit
->buffer
;
205 if (strcmp(encoding
, git_commit_encoding
))
206 out
->reencoded_message
= reencode_string(commit
->buffer
,
207 git_commit_encoding
, encoding
);
208 if (out
->reencoded_message
)
209 out
->message
= out
->reencoded_message
;
211 abbrev
= find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
);
212 abbrev_len
= strlen(abbrev
);
214 subject_len
= find_commit_subject(out
->message
, &subject
);
216 out
->parent_label
= xmalloc(strlen("parent of ") + abbrev_len
+
217 strlen("... ") + subject_len
+ 1);
218 q
= out
->parent_label
;
219 q
= mempcpy(q
, "parent of ", strlen("parent of "));
221 q
= mempcpy(q
, abbrev
, abbrev_len
);
222 q
= mempcpy(q
, "... ", strlen("... "));
224 q
= mempcpy(q
, subject
, subject_len
);
229 static void free_message(struct commit_message
*msg
)
231 free(msg
->parent_label
);
232 free(msg
->reencoded_message
);
235 static char *get_encoding(const char *message
)
237 const char *p
= message
, *eol
;
239 while (*p
&& *p
!= '\n') {
240 for (eol
= p
+ 1; *eol
&& *eol
!= '\n'; eol
++)
242 if (!prefixcmp(p
, "encoding ")) {
243 char *result
= xmalloc(eol
- 8 - p
);
244 strlcpy(result
, p
+ 9, eol
- 8 - p
);
254 static void write_cherry_pick_head(struct commit
*commit
)
257 struct strbuf buf
= STRBUF_INIT
;
259 strbuf_addf(&buf
, "%s\n", sha1_to_hex(commit
->object
.sha1
));
261 fd
= open(git_path("CHERRY_PICK_HEAD"), O_WRONLY
| O_CREAT
, 0666);
263 die_errno(_("Could not open '%s' for writing"),
264 git_path("CHERRY_PICK_HEAD"));
265 if (write_in_full(fd
, buf
.buf
, buf
.len
) != buf
.len
|| close(fd
))
266 die_errno(_("Could not write to '%s'"), git_path("CHERRY_PICK_HEAD"));
267 strbuf_release(&buf
);
270 static void print_advice(void)
272 char *msg
= getenv("GIT_CHERRY_PICK_HELP");
275 fprintf(stderr
, "%s\n", msg
);
277 * A conflict has occured but the porcelain
278 * (typically rebase --interactive) wants to take care
279 * of the commit itself so remove CHERRY_PICK_HEAD
281 unlink(git_path("CHERRY_PICK_HEAD"));
285 advise("after resolving the conflicts, mark the corrected paths");
286 advise("with 'git add <paths>' or 'git rm <paths>'");
287 advise("and commit the result with 'git commit'");
290 static void write_message(struct strbuf
*msgbuf
, const char *filename
)
292 static struct lock_file msg_file
;
294 int msg_fd
= hold_lock_file_for_update(&msg_file
, filename
,
296 if (write_in_full(msg_fd
, msgbuf
->buf
, msgbuf
->len
) < 0)
297 die_errno(_("Could not write to %s."), filename
);
298 strbuf_release(msgbuf
);
299 if (commit_lock_file(&msg_file
) < 0)
300 die(_("Error wrapping up %s"), filename
);
303 static struct tree
*empty_tree(void)
305 struct tree
*tree
= xcalloc(1, sizeof(struct tree
));
307 tree
->object
.parsed
= 1;
308 tree
->object
.type
= OBJ_TREE
;
309 pretend_sha1_file(NULL
, 0, OBJ_TREE
, tree
->object
.sha1
);
313 static NORETURN
void die_dirty_index(struct replay_opts
*opts
)
315 if (read_cache_unmerged()) {
316 die_resolve_conflict(action_name(opts
));
318 if (advice_commit_before_merge
) {
319 if (opts
->action
== REVERT
)
320 die(_("Your local changes would be overwritten by revert.\n"
321 "Please, commit your changes or stash them to proceed."));
323 die(_("Your local changes would be overwritten by cherry-pick.\n"
324 "Please, commit your changes or stash them to proceed."));
326 if (opts
->action
== REVERT
)
327 die(_("Your local changes would be overwritten by revert.\n"));
329 die(_("Your local changes would be overwritten by cherry-pick.\n"));
334 static int fast_forward_to(const unsigned char *to
, const unsigned char *from
)
336 struct ref_lock
*ref_lock
;
339 if (checkout_fast_forward(from
, to
))
340 exit(1); /* the callee should have complained already */
341 ref_lock
= lock_any_ref_for_update("HEAD", from
, 0);
342 return write_ref_sha1(ref_lock
, to
, "cherry-pick");
345 static int do_recursive_merge(struct commit
*base
, struct commit
*next
,
346 const char *base_label
, const char *next_label
,
347 unsigned char *head
, struct strbuf
*msgbuf
,
348 struct replay_opts
*opts
)
350 struct merge_options o
;
351 struct tree
*result
, *next_tree
, *base_tree
, *head_tree
;
354 static struct lock_file index_lock
;
356 index_fd
= hold_locked_index(&index_lock
, 1);
360 init_merge_options(&o
);
361 o
.ancestor
= base
? base_label
: "(empty tree)";
363 o
.branch2
= next
? next_label
: "(empty tree)";
365 head_tree
= parse_tree_indirect(head
);
366 next_tree
= next
? next
->tree
: empty_tree();
367 base_tree
= base
? base
->tree
: empty_tree();
369 for (xopt
= opts
->xopts
; xopt
!= opts
->xopts
+ opts
->xopts_nr
; xopt
++)
370 parse_merge_opt(&o
, *xopt
);
372 clean
= merge_trees(&o
,
374 next_tree
, base_tree
, &result
);
376 if (active_cache_changed
&&
377 (write_cache(index_fd
, active_cache
, active_nr
) ||
378 commit_locked_index(&index_lock
)))
379 /* TRANSLATORS: %s will be "revert" or "cherry-pick" */
380 die(_("%s: Unable to write new index file"), action_name(opts
));
381 rollback_lock_file(&index_lock
);
385 strbuf_addstr(msgbuf
, "\nConflicts:\n\n");
386 for (i
= 0; i
< active_nr
;) {
387 struct cache_entry
*ce
= active_cache
[i
++];
389 strbuf_addch(msgbuf
, '\t');
390 strbuf_addstr(msgbuf
, ce
->name
);
391 strbuf_addch(msgbuf
, '\n');
392 while (i
< active_nr
&& !strcmp(ce
->name
,
393 active_cache
[i
]->name
))
403 * If we are cherry-pick, and if the merge did not result in
404 * hand-editing, we will hit this commit and inherit the original
405 * author date and name.
406 * If we are revert, or if our cherry-pick results in a hand merge,
407 * we had better say that the current user is responsible for that.
409 static int run_git_commit(const char *defmsg
, struct replay_opts
*opts
)
411 /* 6 is max possible length of our args array including NULL */
415 args
[i
++] = "commit";
425 return run_command_v_opt(args
, RUN_GIT_CMD
);
428 static int do_pick_commit(struct commit
*commit
, struct replay_opts
*opts
)
430 unsigned char head
[20];
431 struct commit
*base
, *next
, *parent
;
432 const char *base_label
, *next_label
;
433 struct commit_message msg
= { NULL
, NULL
, NULL
, NULL
, NULL
};
435 struct strbuf msgbuf
= STRBUF_INIT
;
438 if (opts
->no_commit
) {
440 * We do not intend to commit immediately. We just want to
441 * merge the differences in, so let's compute the tree
442 * that represents the "current" state for merge-recursive
445 if (write_cache_as_tree(head
, 0, NULL
))
446 die (_("Your index file is unmerged."));
448 if (get_sha1("HEAD", head
))
449 die (_("You do not have a valid HEAD"));
450 if (index_differs_from("HEAD", 0))
451 die_dirty_index(opts
);
455 if (!commit
->parents
) {
458 else if (commit
->parents
->next
) {
459 /* Reverting or cherry-picking a merge commit */
461 struct commit_list
*p
;
464 die(_("Commit %s is a merge but no -m option was given."),
465 sha1_to_hex(commit
->object
.sha1
));
467 for (cnt
= 1, p
= commit
->parents
;
468 cnt
!= opts
->mainline
&& p
;
471 if (cnt
!= opts
->mainline
|| !p
)
472 die(_("Commit %s does not have parent %d"),
473 sha1_to_hex(commit
->object
.sha1
), opts
->mainline
);
475 } else if (0 < opts
->mainline
)
476 die(_("Mainline was specified but commit %s is not a merge."),
477 sha1_to_hex(commit
->object
.sha1
));
479 parent
= commit
->parents
->item
;
481 if (opts
->allow_ff
&& parent
&& !hashcmp(parent
->object
.sha1
, head
))
482 return fast_forward_to(commit
->object
.sha1
, head
);
484 if (parent
&& parse_commit(parent
) < 0)
485 /* TRANSLATORS: The first %s will be "revert" or
486 "cherry-pick", the second %s a SHA1 */
487 die(_("%s: cannot parse parent commit %s"),
488 action_name(opts
), sha1_to_hex(parent
->object
.sha1
));
490 if (get_message(commit
, &msg
) != 0)
491 die(_("Cannot get commit message for %s"),
492 sha1_to_hex(commit
->object
.sha1
));
495 * "commit" is an existing commit. We would want to apply
496 * the difference it introduces since its first parent "prev"
497 * on top of the current HEAD if we are cherry-pick. Or the
498 * reverse of it if we are revert.
501 defmsg
= git_pathdup("MERGE_MSG");
503 if (opts
->action
== REVERT
) {
505 base_label
= msg
.label
;
507 next_label
= msg
.parent_label
;
508 strbuf_addstr(&msgbuf
, "Revert \"");
509 strbuf_addstr(&msgbuf
, msg
.subject
);
510 strbuf_addstr(&msgbuf
, "\"\n\nThis reverts commit ");
511 strbuf_addstr(&msgbuf
, sha1_to_hex(commit
->object
.sha1
));
513 if (commit
->parents
&& commit
->parents
->next
) {
514 strbuf_addstr(&msgbuf
, ", reversing\nchanges made to ");
515 strbuf_addstr(&msgbuf
, sha1_to_hex(parent
->object
.sha1
));
517 strbuf_addstr(&msgbuf
, ".\n");
522 base_label
= msg
.parent_label
;
524 next_label
= msg
.label
;
527 * Append the commit log message to msgbuf; it starts
528 * after the tree, parent, author, committer
529 * information followed by "\n\n".
531 p
= strstr(msg
.message
, "\n\n");
534 strbuf_addstr(&msgbuf
, p
);
537 if (opts
->record_origin
) {
538 strbuf_addstr(&msgbuf
, "(cherry picked from commit ");
539 strbuf_addstr(&msgbuf
, sha1_to_hex(commit
->object
.sha1
));
540 strbuf_addstr(&msgbuf
, ")\n");
542 if (!opts
->no_commit
)
543 write_cherry_pick_head(commit
);
546 if (!opts
->strategy
|| !strcmp(opts
->strategy
, "recursive") || opts
->action
== REVERT
) {
547 res
= do_recursive_merge(base
, next
, base_label
, next_label
,
548 head
, &msgbuf
, opts
);
549 write_message(&msgbuf
, defmsg
);
551 struct commit_list
*common
= NULL
;
552 struct commit_list
*remotes
= NULL
;
554 write_message(&msgbuf
, defmsg
);
556 commit_list_insert(base
, &common
);
557 commit_list_insert(next
, &remotes
);
558 res
= try_merge_command(opts
->strategy
, opts
->xopts_nr
, opts
->xopts
,
559 common
, sha1_to_hex(head
), remotes
);
560 free_commit_list(common
);
561 free_commit_list(remotes
);
565 error(opts
->action
== REVERT
566 ? _("could not revert %s... %s")
567 : _("could not apply %s... %s"),
568 find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
),
571 rerere(opts
->allow_rerere_auto
);
573 if (!opts
->no_commit
)
574 res
= run_git_commit(defmsg
, opts
);
583 static void prepare_revs(struct rev_info
*revs
, struct replay_opts
*opts
)
587 init_revisions(revs
, NULL
);
589 if (opts
->action
!= REVERT
)
592 argc
= setup_revisions(opts
->commit_argc
, opts
->commit_argv
, revs
, NULL
);
594 usage(*revert_or_cherry_pick_usage(opts
));
596 if (prepare_revision_walk(revs
))
597 die(_("revision walk setup failed"));
600 die(_("empty commit set passed"));
603 static void read_and_refresh_cache(struct replay_opts
*opts
)
605 static struct lock_file index_lock
;
606 int index_fd
= hold_locked_index(&index_lock
, 0);
607 if (read_index_preload(&the_index
, NULL
) < 0)
608 die(_("git %s: failed to read the index"), action_name(opts
));
609 refresh_index(&the_index
, REFRESH_QUIET
|REFRESH_UNMERGED
, NULL
, NULL
, NULL
);
610 if (the_index
.cache_changed
) {
611 if (write_index(&the_index
, index_fd
) ||
612 commit_locked_index(&index_lock
))
613 die(_("git %s: failed to refresh the index"), action_name(opts
));
615 rollback_lock_file(&index_lock
);
619 * Append a commit to the end of the commit_list.
621 * next starts by pointing to the variable that holds the head of an
622 * empty commit_list, and is updated to point to the "next" field of
623 * the last item on the list as new commits are appended.
627 * struct commit_list *list;
628 * struct commit_list **next = &list;
630 * next = commit_list_append(c1, next);
631 * next = commit_list_append(c2, next);
632 * assert(commit_list_count(list) == 2);
635 struct commit_list
**commit_list_append(struct commit
*commit
,
636 struct commit_list
**next
)
638 struct commit_list
*new = xmalloc(sizeof(struct commit_list
));
645 static int format_todo(struct strbuf
*buf
, struct commit_list
*todo_list
,
646 struct replay_opts
*opts
)
648 struct commit_list
*cur
= NULL
;
649 struct commit_message msg
= { NULL
, NULL
, NULL
, NULL
, NULL
};
650 const char *sha1_abbrev
= NULL
;
651 const char *action_str
= opts
->action
== REVERT
? "revert" : "pick";
653 for (cur
= todo_list
; cur
; cur
= cur
->next
) {
654 sha1_abbrev
= find_unique_abbrev(cur
->item
->object
.sha1
, DEFAULT_ABBREV
);
655 if (get_message(cur
->item
, &msg
))
656 return error(_("Cannot get commit message for %s"), sha1_abbrev
);
657 strbuf_addf(buf
, "%s %s %s\n", action_str
, sha1_abbrev
, msg
.subject
);
662 static void walk_revs_populate_todo(struct commit_list
**todo_list
,
663 struct replay_opts
*opts
)
665 struct rev_info revs
;
666 struct commit
*commit
;
667 struct commit_list
**next
;
669 prepare_revs(&revs
, opts
);
672 while ((commit
= get_revision(&revs
)))
673 next
= commit_list_append(commit
, next
);
676 static void create_seq_dir(void)
678 const char *seq_dir
= git_path(SEQ_DIR
);
680 if (!(file_exists(seq_dir
) && is_directory(seq_dir
))
681 && mkdir(seq_dir
, 0777) < 0)
682 die_errno(_("Could not create sequencer directory '%s'."), seq_dir
);
685 static void save_head(const char *head
)
687 const char *head_file
= git_path(SEQ_HEAD_FILE
);
688 static struct lock_file head_lock
;
689 struct strbuf buf
= STRBUF_INIT
;
692 fd
= hold_lock_file_for_update(&head_lock
, head_file
, LOCK_DIE_ON_ERROR
);
693 strbuf_addf(&buf
, "%s\n", head
);
694 if (write_in_full(fd
, buf
.buf
, buf
.len
) < 0)
695 die_errno(_("Could not write to %s."), head_file
);
696 if (commit_lock_file(&head_lock
) < 0)
697 die(_("Error wrapping up %s."), head_file
);
700 static void save_todo(struct commit_list
*todo_list
, struct replay_opts
*opts
)
702 const char *todo_file
= git_path(SEQ_TODO_FILE
);
703 static struct lock_file todo_lock
;
704 struct strbuf buf
= STRBUF_INIT
;
707 fd
= hold_lock_file_for_update(&todo_lock
, todo_file
, LOCK_DIE_ON_ERROR
);
708 if (format_todo(&buf
, todo_list
, opts
) < 0)
709 die(_("Could not format %s."), todo_file
);
710 if (write_in_full(fd
, buf
.buf
, buf
.len
) < 0) {
711 strbuf_release(&buf
);
712 die_errno(_("Could not write to %s."), todo_file
);
714 if (commit_lock_file(&todo_lock
) < 0) {
715 strbuf_release(&buf
);
716 die(_("Error wrapping up %s."), todo_file
);
718 strbuf_release(&buf
);
721 static void save_opts(struct replay_opts
*opts
)
723 const char *opts_file
= git_path(SEQ_OPTS_FILE
);
726 git_config_set_in_file(opts_file
, "options.no-commit", "true");
728 git_config_set_in_file(opts_file
, "options.edit", "true");
730 git_config_set_in_file(opts_file
, "options.signoff", "true");
731 if (opts
->record_origin
)
732 git_config_set_in_file(opts_file
, "options.record-origin", "true");
734 git_config_set_in_file(opts_file
, "options.allow-ff", "true");
735 if (opts
->mainline
) {
736 struct strbuf buf
= STRBUF_INIT
;
737 strbuf_addf(&buf
, "%d", opts
->mainline
);
738 git_config_set_in_file(opts_file
, "options.mainline", buf
.buf
);
739 strbuf_release(&buf
);
742 git_config_set_in_file(opts_file
, "options.strategy", opts
->strategy
);
745 for (i
= 0; i
< opts
->xopts_nr
; i
++)
746 git_config_set_multivar_in_file(opts_file
,
747 "options.strategy-option",
748 opts
->xopts
[i
], "^$", 0);
752 static int pick_commits(struct commit_list
*todo_list
, struct replay_opts
*opts
)
754 struct commit_list
*cur
;
757 setenv(GIT_REFLOG_ACTION
, action_name(opts
), 0);
759 assert(!(opts
->signoff
|| opts
->no_commit
||
760 opts
->record_origin
|| opts
->edit
));
761 read_and_refresh_cache(opts
);
763 for (cur
= todo_list
; cur
; cur
= cur
->next
) {
764 save_todo(cur
, opts
);
765 res
= do_pick_commit(cur
->item
, opts
);
771 * Sequence of picks finished successfully; cleanup by
772 * removing the .git/sequencer directory
774 remove_sequencer_state(1);
778 static int pick_revisions(struct replay_opts
*opts
)
780 struct commit_list
*todo_list
= NULL
;
781 unsigned char sha1
[20];
783 read_and_refresh_cache(opts
);
786 * Decide what to do depending on the arguments; a fresh
787 * cherry-pick should be handled differently from an existing
788 * one that is being continued
790 if (opts
->subcommand
== REPLAY_RESET
) {
791 remove_sequencer_state(1);
794 /* Start a new cherry-pick/ revert sequence */
795 walk_revs_populate_todo(&todo_list
, opts
);
797 if (get_sha1("HEAD", sha1
)) {
798 if (opts
->action
== REVERT
)
799 die(_("Can't revert as initial commit"));
800 die(_("Can't cherry-pick into empty head"));
802 save_head(sha1_to_hex(sha1
));
805 return pick_commits(todo_list
, opts
);
808 int cmd_revert(int argc
, const char **argv
, const char *prefix
)
810 struct replay_opts opts
;
812 memset(&opts
, 0, sizeof(opts
));
815 opts
.action
= REVERT
;
816 git_config(git_default_config
, NULL
);
817 parse_args(argc
, argv
, &opts
);
818 return pick_revisions(&opts
);
821 int cmd_cherry_pick(int argc
, const char **argv
, const char *prefix
)
823 struct replay_opts opts
;
825 memset(&opts
, 0, sizeof(opts
));
826 opts
.action
= CHERRY_PICK
;
827 git_config(git_default_config
, NULL
);
828 parse_args(argc
, argv
, &opts
);
829 return pick_revisions(&opts
);