Merge branch 'mm/reset-facl-before-umask-test'

Test tweaks for those who have default ACL in their git source tree
that interfere with the umask test.

* mm/reset-facl-before-umask-test:
t0001: don't let a default ACL interfere with the umask test

diff --combined t/t0001-init.sh
index b8fc588b1922760ade8502fda3dc465f6ebf2887,7bfc69784db32687965baf4e86456d9ac1835504..e424de5363848233d2c1d9807df0a01411fd0d6d
--- 1/t/t0001-init.sh
--- 2/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@@ -258,6 -258,9 +258,9 @@@ test_expect_success POSIXPERM 'init cre
        (
                # Leading directories should honor umask while
                # the repository itself should follow "shared"
+               mkdir newdir &&
+               # Remove a default ACL if possible.
+               (setfacl -k newdir 2>/dev/null || true) &&
                umask 002 &&
                git init --bare --shared=0660 newdir/a/b/c &&
                test_path_is_dir newdir/a/b/c/refs &&
@@@ -384,30 -387,4 +387,30 @@@ test_expect_success MINGW 'bare git di
        ! is_hidden newdir
  '
  
 +test_expect_success 'remote init from does not use config from cwd' '
 +      rm -rf newdir &&
 +      test_config core.logallrefupdates true &&
 +      git init newdir &&
 +      echo true >expect &&
 +      git -C newdir config --bool core.logallrefupdates >actual &&
 +      test_cmp expect actual
 +'
 +
 +test_expect_success 're-init from a linked worktree' '
 +      git init main-worktree &&
 +      (
 +              cd main-worktree &&
 +              test_commit first &&
 +              git worktree add ../linked-worktree &&
 +              mv .git/info/exclude expected-exclude &&
 +              cp .git/config expected-config &&
 +              find .git/worktrees -print | sort >expected &&
 +              git -C ../linked-worktree init &&
 +              test_cmp expected-exclude .git/info/exclude &&
 +              test_cmp expected-config .git/config &&
 +              find .git/worktrees -print | sort >actual &&
 +              test_cmp expected actual
 +      )
 +'
 +
  test_done