From: Junio C Hamano Date: Thu, 14 May 2020 21:39:43 +0000 (-0700) Subject: Merge branch 'js/rebase-autosquash-double-fixup-fix' X-Git-Tag: v2.27.0-rc0~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2a0942a16a6459d4a52e7ee4ec85f7f90ad5334;p=thirdparty%2Fgit.git Merge branch 'js/rebase-autosquash-double-fixup-fix' "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 --- a2a0942a16a6459d4a52e7ee4ec85f7f90ad5334