summaryrefslogtreecommitdiff
path: root/branch.c
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2011-12-10 07:03:48 -0600
committerJunio C Hamano <gitster@pobox.com>2011-12-12 13:33:53 -0800
commita7eff1e027270062c4c08f11d63b4103f3d917fe (patch)
treee864a734c1ff29005da5a9691e68b7b403add40b /branch.c
parent218b65fbf9428517e739b8bc26680c29910cf1cd (diff)
downloadgit-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 'branch.c')
-rw-r--r--branch.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/branch.c b/branch.c
index 025a97be02..a6b6722e24 100644
--- 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);
}