Skip to content

Commit b15aa97

Browse files
jrngitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 2a4037d commit b15aa97

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

builtin/revert.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -942,6 +942,7 @@ static int sequencer_rollback(struct replay_opts *opts)
942942
}
943943
if (reset_for_rollback(sha1))
944944
goto fail;
945+
remove_sequencer_state(1);
945946
strbuf_release(&buf);
946947
return 0;
947948
fail:

t/t7106-reset-sequence.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,12 @@ test_expect_success 'reset --hard cleans up sequencer state, providing one-level
4141
test_path_is_missing .git/sequencer-old
4242
'
4343

44+
test_expect_success 'cherry-pick --abort does not leave sequencer-old dir' '
45+
pristine_detach initial &&
46+
test_must_fail git cherry-pick base..anotherpick &&
47+
git cherry-pick --abort &&
48+
test_path_is_missing .git/sequencer &&
49+
test_path_is_missing .git/sequencer-old
50+
'
51+
4452
test_done

0 commit comments

Comments
 (0)