[PATCH 16/18] revert: Don't implicitly stomp pending sequencer operation
- From
Ramkumar Ramachandra <artagnon@gmail.com>
- Date
- Aug 1, 2011, 18:07 UTC
- Message-ID
- <1312222025-28453-17-git-send-email-artagnon@gmail.com>
- In-Reply-To
- <1312222025-28453-1-git-send-email-artagnon@gmail.com>
Protect the user from forgetting about a pending sequencer operation by immediately erroring out when an existing cherry-pick or revert operation is in progress like:
$ git cherry-pick foo ... conflict ... $ git cherry-pick moo error: .git/sequencer already exists hint: A cherry-pick or revert is in progress hint: Use --reset to forget about it fatal: cherry-pick failed
A naive version of this would break the following established ways of working:
$ git cherry-pick foo ... conflict ... $ git reset --hard # I actually meant "moo" when I said "foo" $ git cherry-pick moo
$ git cherry-pick foo ... conflict ... $ git commit # commit the resolution $ git cherry-pick moo # New operation
However, the previous patches "reset: Make reset remove the sequencer state" and "revert: Remove sequencer state when no commits are pending" make sure that this does not happen.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- builtin/revert.c | 30 +++++++++++++++++++++++++----- 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 ce57301..09d4b6b 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"; @@ -675,13 +684,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) @@ -803,9 +814,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 0b68397..fe65d89 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
-- 1.7.4.rc1.7.g2cf08.dirty