diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-19 15:27:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-19 15:27:59 -0800 |
| commit | fced6d171e0e242e330dd71b123de4bcd2616f0b (patch) | |
| tree | 53f5a3c1b3f033463b704260352bac7e0aa3134d /diff.c | |
| parent | faefdd61ec7c7f6f3c8c9907891465ac9a2a1475 (diff) | |
| parent | d66851806ff25c6afdb4650d8292a50d5ca0ea6d (diff) | |
| download | git-fced6d171e0e242e330dd71b123de4bcd2616f0b.tar.gz | |
Merge 'jk/diff-release-filespec-fix' into js/default-branch-name-tests-final-stretch
* 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); } |