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

[thirdparty/git.git] / t / t7800-difftool.sh

diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 524f30f7dc7c2388bad3885303541d4a72ed4470..a578b35761f2e97177dd8342ff5d949e719b64d3 100755 (executable)
--- 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 &&