@matheusbsbs / matheus-bagliano / commits / c9d6c78870

read-cache: make the split index obey umask settings

Make the split index write out its .git/sharedindex_* files with the same permissions as .git/index. This only changes the behavior when core.sharedRepository isn't set, i.e. the user's umask settings will be respected. This hasn't been the case ever since the split index was originally implemented in c18b80a0e8 ("update-index: new options to enable/disable split index mode", 2014-06-13). A mkstemp()-like function has always been used to create it. First mkstemp() itself, and then later our own mkstemp()-like in f6ecc62dbf ("write_shared_index(): use tempfile module", 2015-08-10) A related bug was fixed in df801f3f9f ("read-cache: use shared perms when writing shared index", 2017-06-25). Since then the split index has respected core.sharedRepository. However, using that setting should not be required simply to make git obey the user's umask setting. It's intended for the use-case of overriding whatever that umask is set to. This fixes cases where the user has e.g. set his umask to 022 on a shared server in anticipation of other user's needing to run "status", "log" etc. in his repository. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Nov 18, 2018 at 19:04 UTC c9d6c78870defec48dfa8bc1fd37ea51379e737d
2 files changed +22 -1
read-cache.c
+2 -1
@@ -2774,7 +2774,8 @@ int write_locked_index(struct index_state *istate, struct lock_file *lock,
2774 struct tempfile *temp;
2775 int saved_errno;
2776
2777 - temp = mks_tempfile(git_path("sharedindex_XXXXXX"));
2777 + /* Same initial permissions as the main .git/index file */
2778 + temp = mks_tempfile_sm(git_path("sharedindex_XXXXXX"), 0, 0666);
2779 if (!temp) {
2780 oidclr(&si->base_oid);
2781 ret = do_write_locked_index(istate, lock, flags);
t/t1700-split-index.sh
+20
@@ -369,6 +369,26 @@ test_expect_success 'check splitIndex.sharedIndexExpire set to "never" and "now"
369 test $(ls .git/sharedindex.* | wc -l) -le 2
370 '
371
372 +test_expect_success POSIXPERM 'same mode for index & split index' '
373 + git init same-mode &&
374 + (
375 + cd same-mode &&
376 + test_commit A &&
377 + test_modebits .git/index >index_mode &&
378 + test_must_fail git config core.sharedRepository &&
379 + git -c core.splitIndex=true status &&
380 + shared=$(ls .git/sharedindex.*) &&
381 + case "$shared" in
382 + *" "*)
383 + # we have more than one???
384 + false ;;
385 + *)
386 + test_modebits "$shared" >split_index_mode &&
387 + test_cmp index_mode split_index_mode ;;
388 + esac
389 + )
390 +'
391 +
392 while read -r mode modebits
393 do
394 test_expect_success POSIXPERM "split index respects core.sharedrepository $mode" '