]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits'
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Dec 2019 20:52:46 +0000 (12:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Dec 2019 20:52:46 +0000 (12:52 -0800)
The sequencer machinery compared the HEAD and the state it is
attempting to commit to decide if the result would be a no-op
commit, even when amending a commit, which was incorrect, and
has been corrected.

* pw/sequencer-compare-with-right-parent-to-check-empty-commits:
  sequencer: fix empty commit check when amending

1  2 
sequencer.c

diff --cc sequencer.c
Simple merge