Git fork

Merge branch 'bc/allow-upload-pack-from-other-people'

Test fix for an already graduated topic.

* bc/allow-upload-pack-from-other-people:
t5605: fix test for cloning from a different user

+2 -3
+2 -3
t/t5605-clone-local.sh
··· 156 156 test_expect_success 'cloning a local path with --no-local from a different user succeeds' ' 157 157 git clone --upload-pack="GIT_TEST_ASSUME_DIFFERENT_OWNER=true git-upload-pack" \ 158 158 --no-local a nonlocal-otheruser 2>err && 159 - ! repo_is_hardlinked nonlocal-otheruser && 159 + ! repo_is_hardlinked nonlocal-otheruser/.git && 160 160 # Verify that this is a git repository. 161 161 git -C nonlocal-otheruser rev-parse --show-toplevel && 162 - ! test_grep "detected dubious ownership" err 163 - 162 + test_grep ! "detected dubious ownership" err 164 163 ' 165 164 166 165 test_expect_success 'cloning locally respects "-u" for fetching refs' '