summaryrefslogtreecommitdiff
path: root/builtin/revert.c
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2011-12-10 13:06:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-12-12 21:33:53 (GMT)
commitd596118d7a9b104db10e64b2680a30ea80f1439c (patch)
tree3362b6008ab76012b7038c69ff574513df4cebcb /builtin/revert.c
parenta7eff1e027270062c4c08f11d63b4103f3d917fe (diff)
downloadgit-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 'builtin/revert.c')
-rw-r--r--builtin/revert.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/revert.c b/builtin/revert.c
index 5dcfa6b..028bcbc 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -944,7 +944,7 @@ static int sequencer_rollback(struct replay_opts *opts)
}
if (reset_for_rollback(sha1))
goto fail;
- remove_sequencer_state(1);
+ remove_sequencer_state();
strbuf_release(&buf);
return 0;
fail:
@@ -1026,7 +1026,7 @@ static int pick_commits(struct commit_list *todo_list, struct replay_opts *opts)
* Sequence of picks finished successfully; cleanup by
* removing the .git/sequencer directory
*/
- remove_sequencer_state(1);
+ remove_sequencer_state();
return 0;
}
@@ -1084,7 +1084,7 @@ static int pick_revisions(struct replay_opts *opts)
* one that is being continued
*/
if (opts->subcommand == REPLAY_REMOVE_STATE) {
- remove_sequencer_state(1);
+ remove_sequencer_state();
return 0;
}
if (opts->subcommand == REPLAY_ROLLBACK)