]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'pw/status-with-corrupt-sequencer-state'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2019 18:30:20 +0000 (11:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2019 18:30:20 +0000 (11:30 -0700)
The code to read state files used by the sequencer machinery for
"git status" has been made more robust against a corrupt or stale
state files.

* pw/status-with-corrupt-sequencer-state:
  status: do not report errors in sequencer/todo
  sequencer: factor out todo command name parsing
  sequencer: always allow tab after command name

1  2 
sequencer.c
t/t7512-status-help.sh

diff --cc sequencer.c
Simple merge
Simple merge