undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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()
This commit is contained in:
Junio C Hamano 2020-11-21 15:14:38 -08:00
commit d5e35329dd
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
diff.c
View File

@ -4115,6 +4115,9 @@ void diff_free_filespec_blob(struct diff_filespec *s)
void diff_free_filespec_data(struct diff_filespec *s) void diff_free_filespec_data(struct diff_filespec *s)
{ {
if (!s)
return;
diff_free_filespec_blob(s); diff_free_filespec_blob(s);
FREE_AND_NULL(s->cnt_data); FREE_AND_NULL(s->cnt_data);
} }

13
t/t7800-difftool.sh
View File

@ -728,6 +728,19 @@ test_expect_success 'add -N and difftool -d' '
git difftool --dir-diff --extcmd ls git difftool --dir-diff --extcmd ls
' '
test_expect_success 'difftool --cached with unmerged files' '
test_when_finished git reset --hard &&
test_commit conflicting &&
test_commit conflict-a conflict.t a &&
git reset --hard conflicting &&
test_commit conflict-b conflict.t b &&
test_must_fail git merge conflict-a &&
git difftool --cached --no-prompt >output &&
test_must_be_empty output
'
test_expect_success 'outside worktree' ' test_expect_success 'outside worktree' '
echo 1 >1 && echo 1 >1 &&
echo 2 >2 && echo 2 >2 &&