From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 21 Nov 2020 23:14:38 +0000 (-0800)
Subject: Merge branch 'jk/diff-release-filespec-fix'
X-Git-Tag: v2.30.0-rc0~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d5e35329dd5305d611478e8d5076a8ca75e25f0d;p=thirdparty%2Fgit.git

Merge branch 'jk/diff-release-filespec-fix'

Running "git diff" while allowing external diff in a state with
unmerged paths used to segfault, which has been corrected.

* jk/diff-release-filespec-fix:
  t7800: simplify difftool test
  diff: allow passing NULL to diff_free_filespec_data()
---

d5e35329dd5305d611478e8d5076a8ca75e25f0d