undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cc/shared-index-permbits'

Browse Source 
The way .git/index and .git/sharedindex* files were initially
created gave these files different perm bits until they were
adjusted for shared repository settings.  This was made consistent.

* cc/shared-index-permbits:
  read-cache: make the split index obey umask settings
This commit is contained in:
Junio C Hamano 2018-11-21 20:39:03 +09:00
commit 9fc9555312
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
read-cache.c
View File

@ -3179,7 +3179,8 @@ int write_locked_index(struct index_state *istate, struct lock_file *lock,
struct tempfile *temp; struct tempfile *temp;
int saved_errno; int saved_errno;
temp = mks_tempfile(git_path("sharedindex_XXXXXX")); /* Same initial permissions as the main .git/index file */
temp = mks_tempfile_sm(git_path("sharedindex_XXXXXX"), 0, 0666);
if (!temp) { if (!temp) {
oidclr(&si->base_oid); oidclr(&si->base_oid);
ret = do_write_locked_index(istate, lock, flags); ret = do_write_locked_index(istate, lock, flags);

20
t/t1700-split-index.sh
View File

@ -384,6 +384,26 @@ test_expect_success 'check splitIndex.sharedIndexExpire set to "never" and "now"
test $(ls .git/sharedindex.* | wc -l) -le 2 test $(ls .git/sharedindex.* | wc -l) -le 2
' '
test_expect_success POSIXPERM 'same mode for index & split index' '
git init same-mode &&
(
cd same-mode &&
test_commit A &&
test_modebits .git/index >index_mode &&
test_must_fail git config core.sharedRepository &&
git -c core.splitIndex=true status &&
shared=$(ls .git/sharedindex.*) &&
case "$shared" in
*" "*)
# we have more than one???
false ;;
*)
test_modebits "$shared" >split_index_mode &&
test_cmp index_mode split_index_mode ;;
esac
)
'
while read -r mode modebits while read -r mode modebits
do do
test_expect_success POSIXPERM "split index respects core.sharedrepository $mode" ' test_expect_success POSIXPERM "split index respects core.sharedrepository $mode" '