summaryrefslogtreecommitdiff
path: root/path.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-13 22:45:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-13 22:45:38 (GMT)
commit447d0cca45920bbe409361bb532444f810c75546 (patch)
tree5dcc6d9b52da50102b842e57c1dbcd3c1274f475 /path.c
parentfa6200fc02ad79124322b97fc26f79467789838f (diff)
parent191a8e32b38c7ff0dd884df7bd323b7a5bd4336c (diff)
downloadgit-447d0cca45920bbe409361bb532444f810c75546.zip
git-447d0cca45920bbe409361bb532444f810c75546.tar.gz
git-447d0cca45920bbe409361bb532444f810c75546.tar.bz2
Merge branch 'maint' to sync with 1.5.6.3
* maint: GIT 1.5.6.3 git-am: Do not exit silently if committer is unset t0004: fix timing bug git-mailinfo: document the -n option Fix backwards-incompatible handling of core.sharedRepository
Diffstat (limited to 'path.c')
-rw-r--r--path.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/path.c b/path.c
index 5983255..504eae0 100644
--- a/path.c
+++ b/path.c
@@ -272,7 +272,7 @@ int adjust_shared_perm(const char *path)
int tweak = shared_repository;
if (!(mode & S_IWUSR))
tweak &= ~0222;
- mode = (mode & ~0777) | tweak;
+ mode |= tweak;
} else {
/* Preserve old PERM_UMASK behaviour */
if (mode & S_IWUSR)