diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index fe93ce52e7a8a42fd7f7cfe82bbadf39e1a7d96e..85eb0fbf96a65ad958422da02ca4975fe687da95 100755 (executable)
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
! ( git ls-files foobar | grep foobar )
'
! ( git ls-files foobar | grep foobar )
'
+test_expect_success 'git add to resolve conflicts on otherwise ignored path' '
+ git reset --hard &&
+ H=$(git rev-parse :1/2/a) &&
+ (
+ echo "100644 $H 1 track-this"
+ echo "100644 $H 3 track-this"
+ ) | git update-index --index-info &&
+ echo track-this >>.gitignore &&
+ echo resolved >track-this &&
+ git add track-this
+'
+
test_done
test_done