1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-13 02:56:30 +02:00

Merge branch 'ps/t0610-umask-fix' into next

The "shared repository" test in the t0610 reftable test failed
under restrictive umask setting (e.g. 007), which has been
corrected.

* ps/t0610-umask-fix:
  t0610: execute git-pack-refs(1) with specified umask
  t0610: make `--shared=` tests reusable
This commit is contained in:
Junio C Hamano 2024-04-10 10:09:14 -07:00
commit 659a29b138

View File

@ -96,23 +96,54 @@ test_expect_perms () {
esac
}
for umask in 002 022
do
test_expect_success POSIXPERM 'init: honors core.sharedRepository' '
test_expect_reftable_perms () {
local umask="$1"
local shared="$2"
local expect="$3"
test_expect_success POSIXPERM "init: honors --shared=$shared with umask $umask" '
test_when_finished "rm -rf repo" &&
(
umask $umask &&
git init --shared=true repo &&
test 1 = "$(git -C repo config core.sharedrepository)"
git init --shared=$shared repo
) &&
test_expect_perms "-rw-rw-r--" repo/.git/reftable/tables.list &&
test_expect_perms "$expect" repo/.git/reftable/tables.list &&
for table in repo/.git/reftable/*.ref
do
test_expect_perms "-rw-rw-r--" "$table" ||
test_expect_perms "$expect" "$table" ||
return 1
done
'
done
test_expect_success POSIXPERM "pack-refs: honors --shared=$shared with umask $umask" '
test_when_finished "rm -rf repo" &&
(
umask $umask &&
git init --shared=$shared repo &&
test_commit -C repo A &&
test_line_count = 3 repo/.git/reftable/tables.list &&
git -C repo pack-refs
) &&
test_expect_perms "$expect" repo/.git/reftable/tables.list &&
for table in repo/.git/reftable/*.ref
do
test_expect_perms "$expect" "$table" ||
return 1
done
'
}
test_expect_reftable_perms 002 umask "-rw-rw-r--"
test_expect_reftable_perms 022 umask "-rw-r--r--"
test_expect_reftable_perms 027 umask "-rw-r-----"
test_expect_reftable_perms 002 group "-rw-rw-r--"
test_expect_reftable_perms 022 group "-rw-rw-r--"
test_expect_reftable_perms 027 group "-rw-rw----"
test_expect_reftable_perms 002 world "-rw-rw-r--"
test_expect_reftable_perms 022 world "-rw-rw-r--"
test_expect_reftable_perms 027 world "-rw-rw-r--"
test_expect_success 'clone: can clone reftable repository' '
test_when_finished "rm -rf repo clone" &&
@ -450,26 +481,6 @@ test_expect_success 'pack-refs: does not prune non-table files' '
test_path_is_file repo/.git/reftable/garbage
'
for umask in 002 022
do
test_expect_success POSIXPERM 'pack-refs: honors core.sharedRepository' '
test_when_finished "rm -rf repo" &&
(
umask $umask &&
git init --shared=true repo &&
test_commit -C repo A &&
test_line_count = 3 repo/.git/reftable/tables.list
) &&
git -C repo pack-refs &&
test_expect_perms "-rw-rw-r--" repo/.git/reftable/tables.list &&
for table in repo/.git/reftable/*.ref
do
test_expect_perms "-rw-rw-r--" "$table" ||
return 1
done
'
done
test_expect_success 'packed-refs: writes are synced' '
test_when_finished "rm -rf repo" &&
git init repo &&