diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2011-12-10 13:06:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-12 21:33:53 (GMT) |
| commit | d596118d7a9b104db10e64b2680a30ea80f1439c (patch) | |
| tree | 3362b6008ab76012b7038c69ff574513df4cebcb /sequencer.c | |
| parent | a7eff1e027270062c4c08f11d63b4103f3d917fe (diff) | |
| download | git-d596118d7a9b104db10e64b2680a30ea80f1439c.zip git-d596118d7a9b104db10e64b2680a30ea80f1439c.tar.gz git-d596118d7a9b104db10e64b2680a30ea80f1439c.tar.bz2 | |
revert: stop creating and removing sequencer-old directory
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.c')
| -rw-r--r-- | sequencer.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sequencer.c b/sequencer.c index bc2c046..d1f28a6 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); } |