Skip to content

Commit d03b07e

Browse files
committed
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 parents 11e4c8c + 95b573b commit d03b07e

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

t/t5605-clone-local.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,10 @@ test_expect_success 'cloning a local path with --no-local does not hardlink' '
156156
test_expect_success 'cloning a local path with --no-local from a different user succeeds' '
157157
git clone --upload-pack="GIT_TEST_ASSUME_DIFFERENT_OWNER=true git-upload-pack" \
158158
--no-local a nonlocal-otheruser 2>err &&
159-
! repo_is_hardlinked nonlocal-otheruser &&
159+
! repo_is_hardlinked nonlocal-otheruser/.git &&
160160
# Verify that this is a git repository.
161161
git -C nonlocal-otheruser rev-parse --show-toplevel &&
162-
! test_grep "detected dubious ownership" err
163-
162+
test_grep ! "detected dubious ownership" err
164163
'
165164

166165
test_expect_success 'cloning locally respects "-u" for fetching refs' '

0 commit comments

Comments
 (0)