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

6
builtin/revert.c
View File

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