]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 73d9f96 02471e7)
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)
commita2a0942a16a6459d4a52e7ee4ec85f7f90ad5334
tree83dcf90fd0897ccf3974021dddd6e48042c89637tree | snapshot
parent73d9f96b4790e16335a30380f97d46bd065dc07bcommit | diff
parent02471e7e205c3e6c80f7908877640c0eed526fdacommit | diff
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
sequencer.c diff1 | diff2 | blob | history
t/t3415-rebase-autosquash.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.