difftool -d: ensure that intent-to-add files are handled correctly

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

diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 6bac9ed180e7342b34401b2d6af9e83b4472f08d..524f30f7dc7c2388bad3885303541d4a72ed4470 100755 (executable)
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -125,15 +125,14 @@ test_expect_success 'difftool stops on error with --trust-exit-code' '
        test_when_finished "rm -f for-diff .git/fail-right-file" &&
        test_when_finished "git reset -- for-diff" &&
        write_script .git/fail-right-file <<-\EOF &&
-       echo "$2"
+       echo failed
        exit 1
        EOF
        >for-diff &&
        git add for-diff &&
-       echo file >expect &&
        test_must_fail git difftool -y --trust-exit-code \
                --extcmd .git/fail-right-file branch >actual &&
-       test_cmp expect actual
+       test_line_count = 1 actual
 '
 
 test_expect_success 'difftool honors exit status if command not found' '
@@ -721,6 +720,14 @@ test_expect_success SYMLINKS 'difftool --dir-diff handles modified symlinks' '
        test_cmp expect actual
 '
 
+test_expect_success 'add -N and difftool -d' '
+       test_when_finished git reset --hard &&
+
+       test_write_lines A B C >intent-to-add &&
+       git add -N intent-to-add &&
+       git difftool --dir-diff --extcmd ls
+'
+
 test_expect_success 'outside worktree' '
        echo 1 >1 &&
        echo 2 >2 &&