diff options
| -rw-r--r-- | builtin/revert.c | 30 | ||||
| -rwxr-xr-x | t/t3510-cherry-pick-sequence.sh | 9 |
2 files changed, 34 insertions, 5 deletions
diff --git a/builtin/revert.c b/builtin/revert.c index 000806c7c..19b673910 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -66,6 +66,15 @@ struct replay_opts { #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION" +static void fatal(const char *advice, ...) +{ + va_list params; + + va_start(params, advice); + vreportf("fatal: ", advice, params); + va_end(params); +} + static const char *action_name(const struct replay_opts *opts) { return opts->action == REVERT ? "revert" : "cherry-pick"; @@ -673,13 +682,15 @@ static void walk_revs_populate_todo(struct commit_list **todo_list, next = commit_list_append(commit, next); } -static void create_seq_dir(void) +static int create_seq_dir(void) { const char *seq_dir = git_path(SEQ_DIR); - if (!(file_exists(seq_dir) && is_directory(seq_dir)) - && mkdir(seq_dir, 0777) < 0) + if (file_exists(seq_dir)) + return error(_("%s already exists."), seq_dir); + else if (mkdir(seq_dir, 0777) < 0) die_errno(_("Could not create sequencer directory '%s'."), seq_dir); + return 0; } static void save_head(const char *head) @@ -801,9 +812,18 @@ static int pick_revisions(struct replay_opts *opts) remove_sequencer_state(1); return 0; } else { - /* Start a new cherry-pick/ revert sequence */ + /* + * Start a new cherry-pick/ revert sequence; but + * first, make sure that an existing one isn't in + * progress + */ + walk_revs_populate_todo(&todo_list, opts); - create_seq_dir(); + if (create_seq_dir() < 0) { + fatal(_("A cherry-pick or revert is in progress.")); + advise(_("Use --reset to forget about it")); + exit(128); + } if (get_sha1("HEAD", sha1)) { if (opts->action == REVERT) die(_("Can't revert as initial commit")); diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh index a41408657..566a15ed8 100755 --- a/t/t3510-cherry-pick-sequence.sh +++ b/t/t3510-cherry-pick-sequence.sh @@ -106,4 +106,13 @@ test_expect_success 'cherry-pick cleans up sequencer state when one commit is le test_cmp expect actual ' +test_expect_success 'cherry-pick does not implicitly stomp an existing operation' ' + pristine_detach initial && + test_must_fail git cherry-pick base..anotherpick && + test-chmtime -v +0 .git/sequencer >expect && + test_must_fail git cherry-pick unrelatedpick && + test-chmtime -v +0 .git/sequencer >actual && + test_cmp expect actual +' + test_done |