This problem was reported in https://github.com/git-for-windows/git/issues/2677, but the problem actually lies with git diff --raw, and it seems that the bug has been with us ever since--intent-to-add was introduced. Johannes Schindelin (3): diff-files: fix incorrect usage of an empty tree diff-files --raw: handle intent-to-add files correctly difftool -d: ensure that intent-to-add files are handled correctly diff-lib.c | 16 +++++++++++++++- t/t4000-diff-format.sh | 10 ++++++++++ t/t7800-difftool.sh | 8 ++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) base-commit: b3d7a52fac39193503a0b6728771d1bf6a161464 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-654%2Fdscho%2Fdifftool-ita-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-654/dscho/difftool-ita-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/654 -- gitgitgadget
