mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert: stop creating and removing sequencer-old directory

Browse Source 
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>
This commit is contained in:
Jonathan Nieder
2011-12-10 07:06:12 -06:00
committed by Junio C Hamano
parent a7eff1e027
commit d596118d7a
3 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sequencer.h
View File

@ -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