On Sat, 19 Dec 2020 at 18:13, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Adam Dinwoodie <adam@xxxxxxxxxxxxx> writes: > > Extract from the relevant section of ./t4129-apply-samemode.sh -x > > output, when run with that commit checked out, below: > > > > expecting success of 4129.10 'do not use core.sharedRepository for > > working tree files': > > git reset --hard && > > test_config core.sharedRepository 0666 && > > ( > > # Remove a default ACL if possible. > > (setfacl -k newdir 2>/dev/null || true) && > > umask 0077 && > > > > # Test both files (f1) and leading dirs (d) > > mkdir d && > > touch f1 d/f2 && > > git add f1 d/f2 && > > git diff --staged >patch-f1-and-f2.txt && > > ... "point X" (see below) ... > > > > > rm -rf d f1 && > > git apply patch-f1-and-f2.txt && > > > > echo "-rw-------" >f1_mode.expected && > > echo "drwx------" >d_mode.expected && > > test_modebits f1 >f1_mode.actual && > > test_modebits d >d_mode.actual && > > test_cmp f1_mode.expected f1_mode.actual && > > test_cmp d_mode.expected d_mode.actual > > ) > > ... > > +++ diff -u f1_mode.expected f1_mode.actual > > --- f1_mode.expected 2020-12-19 16:50:20.169378700 +0000 > > +++ f1_mode.actual 2020-12-19 16:50:20.249126000 +0000 > > @@ -1 +1 @@ > > --rw------- > > +-rw-rw-r-- > > This tells us that we are getting the umask (set to "me only") > ignored by "git apply". > > What would we see in the "t4129-*.sh -x" output if we inserted > > ls -ld f1 d d/f2 && > > at "point X" above? Additional output as below: ++ ls -ld f1 d d/f2 drwxrwxr-x+ 1 Adam None 0 Dec 19 18:57 d -rw-rw-r--+ 1 Adam None 0 Dec 19 18:57 d/f2 -rw-rw-r--+ 1 Adam None 0 Dec 19 18:57 f1
