diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-07-11 15:18:17 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-11 13:52:16 -0700 |
| commit | 835252272e0192bd26983e22428480c5c89775fb (patch) | |
| tree | 5aee2b937dd3698794561e24aae3f62978483352 | |
| parent | 55feb1200f0e1a7f6cb8670de0dee97f09d8cb9f (diff) | |
| download | git-835252272e0192bd26983e22428480c5c89775fb.tar.gz git-835252272e0192bd26983e22428480c5c89775fb.tar.xz | |
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>
| -rw-r--r-- | server-info.c | 2 | ||||
| -rw-r--r-- | setup.c | 4 | ||||
| -rwxr-xr-x | t/t1301-shared-repo.sh | 27 |
3 files changed, 33 insertions, 0 deletions
diff --git a/server-info.c b/server-info.c index f9be5a7f6..0d1312ca5 100644 --- a/server-info.c +++ b/server-info.c @@ -38,6 +38,7 @@ static int update_info_refs(int force) return error("unable to update %s", path0); for_each_ref(add_info_ref, NULL); fclose(info_ref_fp); + adjust_shared_perm(path1); rename(path1, path0); free(path0); free(path1); @@ -227,6 +228,7 @@ static int update_info_packs(int force) return error("cannot open %s", name); write_pack_info_file(fp); fclose(fp); + adjust_shared_perm(name); rename(name, infofile); return 0; } @@ -364,6 +364,7 @@ const char *setup_git_directory_gently(int *nongit_ok) int git_config_perm(const char *var, const char *value) { if (value) { + int i; if (!strcmp(value, "umask")) return PERM_UMASK; if (!strcmp(value, "group")) @@ -372,6 +373,9 @@ int git_config_perm(const char *var, const char *value) !strcmp(value, "world") || !strcmp(value, "everybody")) return PERM_EVERYBODY; + i = atoi(value); + if (i > 1) + return i; } return git_config_bool(var, value); } diff --git a/t/t1301-shared-repo.sh b/t/t1301-shared-repo.sh new file mode 100755 index 000000000..bb5f30220 --- /dev/null +++ b/t/t1301-shared-repo.sh @@ -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 |