diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2011-12-10 07:03:48 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-12 13:33:53 -0800 |
| commit | a7eff1e027270062c4c08f11d63b4103f3d917fe (patch) | |
| tree | e864a734c1ff29005da5a9691e68b7b403add40b /t/t3510-cherry-pick-sequence.sh | |
| parent | 218b65fbf9428517e739b8bc26680c29910cf1cd (diff) | |
| download | git-a7eff1e027270062c4c08f11d63b4103f3d917fe.tar.gz | |
Revert "reset: Make reset remove the sequencer state"
This reverts commit 95eb88d8ee588d89b4f06d2753ed4d16ab13b39f, 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>
Diffstat (limited to 't/t3510-cherry-pick-sequence.sh')
| -rwxr-xr-x | t/t3510-cherry-pick-sequence.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh index 851b147f81..e80050e1fe 100755 --- a/t/t3510-cherry-pick-sequence.sh +++ b/t/t3510-cherry-pick-sequence.sh @@ -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 && |