]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'js/rebase-autosquash-double-fixup-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 14 May 2020 21:39:43 +0000 (14:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 May 2020 21:39:43 +0000 (14:39 -0700)
"rebase -i" segfaulted when rearranging a sequence that has a
fix-up that applies another fix-up (which may or may not be a
fix-up of yet another step).

* js/rebase-autosquash-double-fixup-fix:
  rebase --autosquash: fix a potential segfault

1  2 
sequencer.c
t/t3415-rebase-autosquash.sh

diff --cc sequencer.c
Simple merge
Simple merge