X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=sequencer.c;h=d1f28a6945cbbdc8f58a32d7bb481ecd4af6cc39;hb=a12c6b0149e3dadd0701dac4fd0ba2463d251650;hp=bc2c046aab23c5b3de8caa02c23703856ee86fb4;hpb=d9d73b37f34e2e366357b99a6ac74a09681b0ab8;p=git.git

diff --git a/sequencer.c b/sequencer.c
index bc2c046aa..d1f28a694 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -3,17 +3,11 @@
 #include "strbuf.h"
 #include "dir.h"
 
-void remove_sequencer_state(int aggressive)
+void remove_sequencer_state(void)
 {
 	struct strbuf seq_dir = STRBUF_INIT;
-	struct strbuf seq_old_dir = STRBUF_INIT;
 
 	strbuf_addf(&seq_dir, "%s", git_path(SEQ_DIR));
-	strbuf_addf(&seq_old_dir, "%s", git_path(SEQ_OLD_DIR));
-	remove_dir_recursively(&seq_old_dir, 0);
-	rename(git_path(SEQ_DIR), git_path(SEQ_OLD_DIR));
-	if (aggressive)
-		remove_dir_recursively(&seq_old_dir, 0);
+	remove_dir_recursively(&seq_dir, 0);
 	strbuf_release(&seq_dir);
-	strbuf_release(&seq_old_dir);
 }