mirror of
https://github.com/git/git
synced 2024-10-30 04:01:21 +00:00
t4129: don't fail if setgid is set in the test directory
The last test of t4129 creates a directory and expects its setgid bit (g+s) to be off. But this makes the test fail when the parent directory has the bit set, as setgid's state is inherited by newly created subdirectories. One way to solve this problem is to allow the presence of this bit when comparing the return of `test_modebits` with the expected value. But then we may have the same problem in the future when other tests start using `test_modebits` on directories (currently t4129 is the only one) and forget about setgid. Instead, let's make the helper function more robust with respect to the state of the setgid bit in the test directory by removing this bit from the returning value. There should be no problem with existing callers as no one currently expects this bit to be on. Note that the sticky bit (+t) and the setuid bit (u+s) are not inherited, so we don't have to worry about those. Reported-by: Kevin Daudt <me@ikke.info> Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
71ca53e812
commit
ea8bbf2a4e
1 changed files with 7 additions and 2 deletions
|
@ -367,9 +367,14 @@ test_chmod () {
|
||||||
git update-index --add "--chmod=$@"
|
git update-index --add "--chmod=$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Get the modebits from a file or directory.
|
# Get the modebits from a file or directory, ignoring the setgid bit (g+s).
|
||||||
|
# This bit is inherited by subdirectories at their creation. So we remove it
|
||||||
|
# from the returning string to prevent callers from having to worry about the
|
||||||
|
# state of the bit in the test directory.
|
||||||
|
#
|
||||||
test_modebits () {
|
test_modebits () {
|
||||||
ls -ld "$1" | sed -e 's|^\(..........\).*|\1|'
|
ls -ld "$1" | sed -e 's|^\(..........\).*|\1|' \
|
||||||
|
-e 's|^\(......\)S|\1-|' -e 's|^\(......\)s|\1x|'
|
||||||
}
|
}
|
||||||
|
|
||||||
# Unset a configuration variable, but don't fail if it doesn't exist.
|
# Unset a configuration variable, but don't fail if it doesn't exist.
|
||||||
|
|
Loading…
Reference in a new issue