git-apply --whitespace=fix: fix whitespace fuzz introduced by previous run

diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index b52fde8577185adf962b70ad16efbcb7bfe46042..287e058e3766df129dcde82aeddecac59b46e2a6 100755 (executable)
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -104,9 +104,33 @@ test_expect_success 'add ignored ones with -f' '
        git ls-files --error-unmatch d.ig/d.if d.ig/d.ig
 '
 
+test_expect_success 'add ignored ones with -f' '
+       rm -f .git/index &&
+       git add -f d.?? &&
+       git ls-files --error-unmatch d.ig/d.if d.ig/d.ig
+'
+
+test_expect_success '.gitignore with subdirectory' '
+
+       rm -f .git/index &&
+       mkdir -p sub/dir &&
+       echo "!dir/a.*" >sub/.gitignore &&
+       >sub/a.ig &&
+       >sub/dir/a.ig &&
+       git add sub/dir &&
+       git ls-files --error-unmatch sub/dir/a.ig &&
+       rm -f .git/index &&
+       (
+               cd sub/dir &&
+               git add .
+       ) &&
+       git ls-files --error-unmatch sub/dir/a.ig
+'
+
 mkdir 1 1/2 1/3
 touch 1/2/a 1/3/b 1/2/c
 test_expect_success 'check correct prefix detection' '
+       rm -f .git/index &&
        git add 1/2/a 1/3/b 1/2/c
 '
 
@@ -131,8 +155,8 @@ test_expect_success 'git add with filemode=0, symlinks=0 prefers stage 2 over st
        (
                echo "100644 $(git hash-object -w stage1) 1     file"
                echo "100755 $(git hash-object -w stage2) 2     file"
-               echo "100644 $(printf $s | git hash-object -w -t blob --stdin) 1        symlink"
-               echo "120000 $(printf $s | git hash-object -w -t blob --stdin) 2        symlink"
+               echo "100644 $(printf 1 | git hash-object -w -t blob --stdin) 1 symlink"
+               echo "120000 $(printf 2 | git hash-object -w -t blob --stdin) 2 symlink"
        ) | git update-index --index-info &&
        git config core.filemode 0 &&
        git config core.symlinks 0 &&
@@ -143,4 +167,16 @@ test_expect_success 'git add with filemode=0, symlinks=0 prefers stage 2 over st
        git ls-files --stage | grep "^120000 .* 0       symlink$"
 '
 
+test_expect_success 'git add --refresh' '
+       >foo && git add foo && git commit -a -m "commit all" &&
+       test -z "`git diff-index HEAD -- foo`" &&
+       git read-tree HEAD &&
+       case "`git diff-index HEAD -- foo`" in
+       :100644" "*"M   foo") echo ok;;
+       *) echo fail; (exit 1);;
+       esac &&
+       git add --refresh -- foo &&
+       test -z "`git diff-index HEAD -- foo`"
+'
+
 test_done