mirror of
https://github.com/git/git.git
synced 2024-11-08 02:03:12 +01:00
95eb88d8ee
Years of muscle memory have trained users to use "git reset --hard" to remove the branch state after any sort operation. Make it also remove the sequencer state to facilitate this established workflow: $ git cherry-pick foo..bar ... conflict encountered ... $ git reset --hard # Oops, I didn't mean that $ git cherry-pick quux..bar ... cherry-pick succeeded ... Guard against accidental removal of the sequencer state by providing one level of "undo". In the first "reset" invocation, ".git/sequencer" is moved to ".git/sequencer-old"; it is completely removed only in the second invocation. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
44 lines
1.1 KiB
Bash
Executable file
44 lines
1.1 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='Test interaction of reset --hard with sequencer
|
|
|
|
+ anotherpick: rewrites foo to d
|
|
+ picked: rewrites foo to c
|
|
+ unrelatedpick: rewrites unrelated to reallyunrelated
|
|
+ base: rewrites foo to b
|
|
+ initial: writes foo as a, unrelated as unrelated
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
pristine_detach () {
|
|
git cherry-pick --reset &&
|
|
git checkout -f "$1^0" &&
|
|
git read-tree -u --reset HEAD &&
|
|
git clean -d -f -f -q -x
|
|
}
|
|
|
|
test_expect_success setup '
|
|
echo unrelated >unrelated &&
|
|
git add unrelated &&
|
|
test_commit initial foo a &&
|
|
test_commit base foo b &&
|
|
test_commit unrelatedpick unrelated reallyunrelated &&
|
|
test_commit picked foo c &&
|
|
test_commit anotherpick foo d &&
|
|
git config advice.detachedhead false
|
|
|
|
'
|
|
|
|
test_expect_success 'reset --hard cleans up sequencer state, providing one-level undo' '
|
|
pristine_detach initial &&
|
|
test_must_fail git cherry-pick base..anotherpick &&
|
|
test_path_is_dir .git/sequencer &&
|
|
git reset --hard &&
|
|
test_path_is_missing .git/sequencer &&
|
|
test_path_is_dir .git/sequencer-old &&
|
|
git reset --hard &&
|
|
test_path_is_missing .git/sequencer-old
|
|
'
|
|
|
|
test_done
|