Revert "reset: Make reset remove the sequencer state"

jrn · gitster · commit a7eff1e02727 · 2011-12-12T13:33:53.000-08:00
This reverts commit 95eb88d, 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>
diff --git a/branch.c b/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);
 }
diff --git 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 &&
 
diff --git a/t/t7106-reset-sequence.sh b/t/t7106-reset-sequence.sh

Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ test_expect_success '--continue asks for help after resolving patch to nil' '`
`353`	`353`	`test_i18ngrep "The previous cherry-pick is now empty" msg`
`354`	`354`	`'`
`355`	`355`
`356`		`-test_expect_failure 'follow advice and skip nil patch' '`
	`356`	`+test_expect_success 'follow advice and skip nil patch' '`
`357`	`357`	`pristine_detach conflicting &&`
`358`	`358`	`test_must_fail git cherry-pick initial..picked &&`
`359`	`359`