From: Phillip Wood <phillip.wood@dunelm.org.uk>
Date: Tue, 16 Apr 2019 10:18:42 +0000 (+0100)
Subject: fix cherry-pick/revert status after commit
X-Git-Tag: v2.22.0-rc0~3^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4a72486de97b5c6b0979b2b51e50c268bdb0d4f6?hp=4a72486de97b5c6b0979b2b51e50c268bdb0d4f6

fix cherry-pick/revert status after commit

If the user commits a conflict resolution using `git commit` in the
middle of a sequence of cherry-picks/reverts then `git status` missed
the fact that a cherry-pick/revert is still in progress.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---