mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Revert "reset: Make reset remove the sequencer state"
This reverts commit 95eb88d8ee
, which
was a UI experiment that did not reflect how "git reset" actually gets
used. The reversion also fixes a test, indicated in the patch.
Encouraged-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
218b65fbf9
commit
a7eff1e027
2
branch.c
2
branch.c
|
@ -3,7 +3,6 @@
|
|||
#include "refs.h"
|
||||
#include "remote.h"
|
||||
#include "commit.h"
|
||||
#include "sequencer.h"
|
||||
|
||||
struct tracking {
|
||||
struct refspec spec;
|
||||
|
@ -247,5 +246,4 @@ void remove_branch_state(void)
|
|||
unlink(git_path("MERGE_MSG"));
|
||||
unlink(git_path("MERGE_MODE"));
|
||||
unlink(git_path("SQUASH_MSG"));
|
||||
remove_sequencer_state(0);
|
||||
}
|
||||
|
|
|
@ -353,7 +353,7 @@ test_expect_success '--continue asks for help after resolving patch to nil' '
|
|||
test_i18ngrep "The previous cherry-pick is now empty" msg
|
||||
'
|
||||
|
||||
test_expect_failure 'follow advice and skip nil patch' '
|
||||
test_expect_success 'follow advice and skip nil patch' '
|
||||
pristine_detach conflicting &&
|
||||
test_must_fail git cherry-pick initial..picked &&
|
||||
|
||||
|
|
|
@ -1,52 +0,0 @@
|
|||
#!/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 --quit &&
|
||||
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_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
|
||||
'
|
||||
|
||||
test_done
|
Loading…
Reference in a new issue