diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-19 23:27:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-19 23:27:59 (GMT) |
| commit | fced6d171e0e242e330dd71b123de4bcd2616f0b (patch) | |
| tree | 53f5a3c1b3f033463b704260352bac7e0aa3134d /t | |
| parent | faefdd61ec7c7f6f3c8c9907891465ac9a2a1475 (diff) | |
| parent | d66851806ff25c6afdb4650d8292a50d5ca0ea6d (diff) | |
| download | git-fced6d171e0e242e330dd71b123de4bcd2616f0b.zip git-fced6d171e0e242e330dd71b123de4bcd2616f0b.tar.gz git-fced6d171e0e242e330dd71b123de4bcd2616f0b.tar.bz2 | |
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 't')
| -rwxr-xr-x | t/t7800-difftool.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 524f30f..a578b35 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -728,6 +728,19 @@ test_expect_success 'add -N and difftool -d' ' 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' ' echo 1 >1 && echo 2 >2 && |