mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
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()
This commit is contained in:
commit
d5e35329dd
3
diff.c
3
diff.c
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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 &&
|
||||||
|
|
Loading…
Reference in a new issue