diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-11-22 02:14:38 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-11-22 02:14:38 +0300 |
commit | d5e35329dd5305d611478e8d5076a8ca75e25f0d (patch) | |
tree | 36042e52cfb5dc66fd01f355950ad3c7d21252b8 /diff.c | |
parent | 0dd171f0bc59f8f1a5bb6741276c35caf2d4117d (diff) | |
parent | d66851806ff25c6afdb4650d8292a50d5ca0ea6d (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()
Diffstat (limited to 'diff.c')
-rw-r--r-- | diff.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -4115,6 +4115,9 @@ void diff_free_filespec_blob(struct diff_filespec *s) void diff_free_filespec_data(struct diff_filespec *s) { + if (!s) + return; + diff_free_filespec_blob(s); FREE_AND_NULL(s->cnt_data); } |