diff options
authorJonathan Nieder <>2011-11-23 10:04:52 (GMT)
committerJunio C Hamano <>2011-11-23 18:56:29 (GMT)
commitb15aa973b296ca36ae39592491bcb02944ac0f7a (patch)
parent2a4037d0a745134a3b94cb3d60d2793a26bd9027 (diff)
revert --abort: do not leave behind useless sequencer-old directory
The "git cherry-pick --abort" command currently renames the .git/sequencer directory to .git/sequencer-old instead of removing it on success due to an accident. cherry-pick --abort is designed to work in three steps: 1) find which commit to roll back to 2) call "git reset --merge <commit>" to move to that commit 3) remove the .git/sequencer directory But the careless author forgot step 3 entirely. The only reason the command worked anyway is that "git reset --merge <commit>" renames the .git/sequencer directory as a secondary effect --- after moving to <commit>, or so the logic goes, it is unlikely but possible that the caller of git reset wants to continue the series of cherry-picks that was in progress, so git renames the sequencer state to .git/sequencer-old to be helpful while allowing the cherry-pick to be resumed if the caller did not want to end the sequence after all. By running "git cherry-pick --abort", the operator has clearly indicated that she is not planning to continue cherry-picking. Remove the (renamed) .git/sequencer directory as intended all along. Signed-off-by: Jonathan Nieder <> Signed-off-by: Junio C Hamano <>
2 files changed, 9 insertions, 0 deletions
diff --git a/builtin/revert.c b/builtin/revert.c
index c0b2592..1ea525c 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -942,6 +942,7 @@ static int sequencer_rollback(struct replay_opts *opts)
if (reset_for_rollback(sha1))
goto fail;
+ remove_sequencer_state(1);
return 0;
diff --git a/t/ b/t/
index 3f86e8c..83f7ea5 100755
--- a/t/
+++ b/t/
@@ -41,4 +41,12 @@ test_expect_success 'reset --hard cleans up sequencer state, providing one-level
test_path_is_missing .git/sequencer-old
+test_expect_success 'cherry-pick --abort does not leave sequencer-old dir' '
+ pristine_detach initial &&
+ test_must_fail git cherry-pick base..anotherpick &&
+ git cherry-pick --abort &&
+ test_path_is_missing .git/sequencer &&
+ test_path_is_missing .git/sequencer-old