]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'pw/clean-sequencer-state-upon-final-commit'
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 May 2019 14:50:35 +0000 (23:50 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 May 2019 14:50:35 +0000 (23:50 +0900)
commitb51a0fdc3822c2ef260f6d496b6df6d33b101e8a
tree62b916b74af5ee6f51b6e924d9d7a65311085420
parent7ba06bc3d026cee54437db5cfddfffe7b4d7a187
parent4a72486de97b5c6b0979b2b51e50c268bdb0d4f6
Merge branch 'pw/clean-sequencer-state-upon-final-commit'

"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
builtin/commit.c
sequencer.c
sequencer.h
t/t3507-cherry-pick-conflict.sh
wt-status.c