summaryrefslogtreecommitdiff
path: root/sequencer.h
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2011-12-10 07:06:12 -0600
committerJunio C Hamano <gitster@pobox.com>2011-12-12 13:33:53 -0800
commitd596118d7a9b104db10e64b2680a30ea80f1439c (patch)
tree3362b6008ab76012b7038c69ff574513df4cebcb /sequencer.h
parenta7eff1e027270062c4c08f11d63b4103f3d917fe (diff)
downloadgit-d596118d7a9b104db10e64b2680a30ea80f1439c.tar.gz
revert: stop creating and removing sequencer-old directoryjn/maint-sequencer-fixes
Now that "git reset" no longer implicitly removes .git/sequencer that the operator may or may not have wanted to keep, the logic to write a backup copy of .git/sequencer and remove it when stale is not needed any more. Simplify the sequencer API and repository layout by dropping it. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.h')
-rw-r--r--sequencer.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/sequencer.h b/sequencer.h
index f435fdb4b1..2d4528f292 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -2,19 +2,11 @@
#define SEQUENCER_H
#define SEQ_DIR "sequencer"
-#define SEQ_OLD_DIR "sequencer-old"
#define SEQ_HEAD_FILE "sequencer/head"
#define SEQ_TODO_FILE "sequencer/todo"
#define SEQ_OPTS_FILE "sequencer/opts"
-/*
- * Removes SEQ_OLD_DIR and renames SEQ_DIR to SEQ_OLD_DIR, ignoring
- * any errors. Intended to be used by 'git reset'.
- *
- * With the aggressive flag, it additionally removes SEQ_OLD_DIR,
- * ignoring any errors. Inteded to be used by the sequencer's
- * '--quit' subcommand.
- */
-void remove_sequencer_state(int aggressive);
+/* Removes SEQ_DIR. */
+extern void remove_sequencer_state(void);
#endif