Skip to content

Commit

Permalink
difftool -d: ensure that intent-to-add files are handled correctly
Browse files Browse the repository at this point in the history
In git-for-windows#2677, a `git difftool
-d` problem was reported. The underlying cause was a bug in `git
diff-files --raw` that we just fixed.

Make sure that the reported `difftool` problem stays fixed.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information
dscho committed Jun 25, 2020
1 parent 69256ab commit 9bb8d84
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions t/t7800-difftool.sh
Expand Up @@ -720,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 &&
Expand Down

0 comments on commit 9bb8d84

Please sign in to comment.