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

10
sequencer.c
View File

@ -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);
}