Merge branch 'rs/commit-m-no-edit' into maint

diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index a6bd99eaf51943a899aa5e5801479b0a84b6b692..d46f0411bd9a08b38035c8fb5ca611723b8baed2 100755 (executable)
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -356,6 +356,13 @@ run_dir_diff_test 'difftool --dir-diff from subdirectory' '
        )
 '
 
+run_dir_diff_test 'difftool --dir-diff when worktree file is missing' '
+       test_when_finished git reset --hard &&
+       rm file2 &&
+       git difftool --dir-diff $symlinks --extcmd ls branch master >output &&
+       grep file2 output
+'
+
 write_script .git/CHECK_SYMLINKS <<\EOF
 for f in file file2 sub/sub
 do