mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pw/clean-sequencer-state-upon-final-commit'

Browse Source 
"git chery-pick" (and "revert" that shares the same runtime engine)
that deals with multiple commits got confused when the final step
gets stopped with a conflict and the user concluded the sequence
with "git commit".  Attempt to fix it by cleaning up the state
files used by these commands in such a situation.

* pw/clean-sequencer-state-upon-final-commit:
  fix cherry-pick/revert status after commit
  commit/reset: try to clean up sequencer state
This commit is contained in:
Junio C Hamano
2019-05-13 23:50:35 +09:00
parent 7ba06bc3d0 4a72486de9
commit b51a0fdc38
7 changed files with 201 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/commit.c
View File

@ -1658,8 +1658,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
die("%s", err.buf);
}
unlink(git_path_cherry_pick_head(the_repository));
unlink(git_path_revert_head(the_repository));
sequencer_post_commit_cleanup(the_repository);
unlink(git_path_merge_head(the_repository));
unlink(git_path_merge_msg(the_repository));
unlink(git_path_merge_mode(the_repository));