mirror of
https://github.com/git/git
synced 2024-10-05 16:19:28 +00:00
Fix core.sharedRepository = 2
For compatibility reasons, "git init --shared=all" does not write "all" into the config, but a number. In the shared setup, you really have to support even older clients on the _same_ repository. But git_config_perm() did not pick up on it. Also, "git update-server-info" failed to pick up on the shared permissions. This patch fixes both issues, and adds a test to prove it. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Tested-by: martin f krafft <madduck@madduck.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
55feb1200f
commit
835252272e
|
@ -38,6 +38,7 @@ static int update_info_refs(int force)
|
||||||
return error("unable to update %s", path0);
|
return error("unable to update %s", path0);
|
||||||
for_each_ref(add_info_ref, NULL);
|
for_each_ref(add_info_ref, NULL);
|
||||||
fclose(info_ref_fp);
|
fclose(info_ref_fp);
|
||||||
|
adjust_shared_perm(path1);
|
||||||
rename(path1, path0);
|
rename(path1, path0);
|
||||||
free(path0);
|
free(path0);
|
||||||
free(path1);
|
free(path1);
|
||||||
|
@ -227,6 +228,7 @@ static int update_info_packs(int force)
|
||||||
return error("cannot open %s", name);
|
return error("cannot open %s", name);
|
||||||
write_pack_info_file(fp);
|
write_pack_info_file(fp);
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
adjust_shared_perm(name);
|
||||||
rename(name, infofile);
|
rename(name, infofile);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
4
setup.c
4
setup.c
|
@ -364,6 +364,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
|
||||||
int git_config_perm(const char *var, const char *value)
|
int git_config_perm(const char *var, const char *value)
|
||||||
{
|
{
|
||||||
if (value) {
|
if (value) {
|
||||||
|
int i;
|
||||||
if (!strcmp(value, "umask"))
|
if (!strcmp(value, "umask"))
|
||||||
return PERM_UMASK;
|
return PERM_UMASK;
|
||||||
if (!strcmp(value, "group"))
|
if (!strcmp(value, "group"))
|
||||||
|
@ -372,6 +373,9 @@ int git_config_perm(const char *var, const char *value)
|
||||||
!strcmp(value, "world") ||
|
!strcmp(value, "world") ||
|
||||||
!strcmp(value, "everybody"))
|
!strcmp(value, "everybody"))
|
||||||
return PERM_EVERYBODY;
|
return PERM_EVERYBODY;
|
||||||
|
i = atoi(value);
|
||||||
|
if (i > 1)
|
||||||
|
return i;
|
||||||
}
|
}
|
||||||
return git_config_bool(var, value);
|
return git_config_bool(var, value);
|
||||||
}
|
}
|
||||||
|
|
27
t/t1301-shared-repo.sh
Executable file
27
t/t1301-shared-repo.sh
Executable file
|
@ -0,0 +1,27 @@
|
||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# Copyright (c) 2007 Johannes Schindelin
|
||||||
|
#
|
||||||
|
|
||||||
|
test_description='Test shared repository initialization'
|
||||||
|
|
||||||
|
. ./test-lib.sh
|
||||||
|
|
||||||
|
test_expect_success 'shared=all' '
|
||||||
|
mkdir sub &&
|
||||||
|
cd sub &&
|
||||||
|
git init --shared=all &&
|
||||||
|
test 2 = $(git config core.sharedrepository)
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'update-server-info honors core.sharedRepository' '
|
||||||
|
: > a1 &&
|
||||||
|
git add a1 &&
|
||||||
|
test_tick &&
|
||||||
|
git commit -m a1 &&
|
||||||
|
umask 0277 &&
|
||||||
|
git update-server-info &&
|
||||||
|
test 444 = $(stat -c %a .git/info/refs)
|
||||||
|
'
|
||||||
|
|
||||||
|
test_done
|
Loading…
Reference in a new issue