Merge branch 'maint'

* maint:
  t3700-add: add a POSIXPERM prerequisite to a new test

diff --combined t/t3700-add.sh
index 6ae5a2cd9511b83ad1d263c0ec0a374fc4bfc981,fe93ce52e7a8a42fd7f7cfe82bbadf39e1a7d96e..85eb0fbf96a65ad958422da02ca4975fe687da95
--- 1/t/t3700-add.sh
--- 2/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@@ -223,7 -223,7 +223,7 @@@ test_expect_success POSIXPERM 'git add 
  '
  rm -f foo2
  
- test_expect_success '--no-ignore-errors overrides config' '
+ test_expect_success POSIXPERM '--no-ignore-errors overrides config' '
         git config add.ignore-errors 1 &&
         git reset --hard &&
         date >foo1 &&
@@@ -243,16 -243,4 +243,16 @@@ test_expect_success BSLASHPSPEC "git ad
        ! ( 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