]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 36fd304 2d05ef2)
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)
commitc9208597a986509e6ce9b3c7936fd7a2b3bb3e43
treeb0be7ecbb4410cc0243d5423427928fb248111e8tree | snapshot
parent36fd304d819d412adf1ed81d6a983dabb28bfc9bcommit | diff
parent2d05ef2778b99e05e6a8a40c5b8d59a3c4ab1274commit | diff
Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits'

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
sequencer.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.