From: Junio C Hamano Date: Mon, 24 Sep 2018 17:30:53 +0000 (-0700) Subject: Merge branch 'tg/range-diff-corner-case-fix' X-Git-Tag: v2.20.0-rc0~204 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=51bbcda1c7f44f42055a032ed394dedeca6df954;p=git Merge branch 'tg/range-diff-corner-case-fix' Recently added "range-diff" had a corner-case bug to cause it segfault, which has been corrected. * tg/range-diff-corner-case-fix: linear-assignment: fix potential out of bounds memory access --- 51bbcda1c7f44f42055a032ed394dedeca6df954 diff --cc t/t3206-range-diff.sh index d481f29259,fb4c13a84a..045aca1c18 --- a/t/t3206-range-diff.sh +++ b/t/t3206-range-diff.sh @@@ -122,6 -122,6 +122,11 @@@ test_expect_success 'changed commit' test_cmp expected actual ' ++test_expect_success 'no commits on one side' ' ++ git commit --amend -m "new message" && ++ git range-diff master HEAD@{1} HEAD ++' ++ test_expect_success 'changed message' ' git range-diff --no-color topic...changed-message >actual && sed s/Z/\ /g >expected <<-EOF &&