diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-19 16:05:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-19 16:05:45 -0800 |
| commit | b8fc5abd73e2e81c396844c09e8003de320709e5 (patch) | |
| tree | 3a96eb03f4853272dd9d0d170ccab6c8cf3db082 /sequencer.c | |
| parent | ea4ef304870d2517ec177f92b000c744bd44cc0c (diff) | |
| parent | d596118d7a9b104db10e64b2680a30ea80f1439c (diff) | |
| download | git-b8fc5abd73e2e81c396844c09e8003de320709e5.tar.gz | |
Merge branch 'jn/maint-sequencer-fixes'
* jn/maint-sequencer-fixes:
revert: stop creating and removing sequencer-old directory
Revert "reset: Make reset remove the sequencer state"
revert: do not remove state until sequence is finished
revert: allow single-pick in the middle of cherry-pick sequence
revert: pass around rev-list args in already-parsed form
revert: allow cherry-pick --continue to commit before resuming
revert: give --continue handling its own function
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 bc2c046aab..d1f28a6945 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); } |