]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0dd171f d668518)
Merge branch 'jk/diff-release-filespec-fix'
authorJunio C Hamano <gitster@pobox.com>
Sat, 21 Nov 2020 23:14:38 +0000 (15:14 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 21 Nov 2020 23:14:38 +0000 (15:14 -0800)
commitd5e35329dd5305d611478e8d5076a8ca75e25f0d
tree36042e52cfb5dc66fd01f355950ad3c7d21252b8tree | snapshot
parent0dd171f0bc59f8f1a5bb6741276c35caf2d4117dcommit | diff
parentd66851806ff25c6afdb4650d8292a50d5ca0ea6dcommit | diff
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()
diff.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.