[PATCH] Add core.sharedRepository == read-only-group

[PATCH] Add core.sharedRepository == read-only-group

[Heikki Orsila]

[-- Attachment #1: Type: text/plain, Size: 136 bytes --]

The attached patch adds a new permission mode for core.sharedRepository. 

-- 
Heikki Orsila
heikki.orsila@iki.fi
http://www.iki.fi/shd

[-- Attachment #2: 0001-Add-core.sharedRepository-read-only-group.patch --]
[-- Type: text/plain, Size: 4854 bytes --]

>From bbfa25faa17bb67e98107edabae114d833f1b838 Mon Sep 17 00:00:00 2001
From: Heikki Orsila <heikki.orsila@iki.fi>
Date: Wed, 9 Apr 2008 22:29:34 +0300
Subject: [PATCH] Add core.sharedRepository == read-only-group

core.sharedRepository == read-only-group allows setting Git repository
files group readable when the default umask of the user masks off group
reading. This can be useful for people with protective umasks (0077).

Note, PERM_READONLY_GROUP is added to the last position in
"enum sharedrepo" to avoid problems with old Git repositories, because
git init --shared stores numbers instead of symbolic names.

Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi>
---
 Documentation/config.txt   |    5 +++--
 Documentation/git-init.txt |    5 ++++-
 cache.h                    |    3 ++-
 path.c                     |   33 +++++++++++++++++++--------------
 setup.c                    |    2 ++
 5 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index fe43b12..6330b63 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -258,8 +258,9 @@ core.repositoryFormatVersion::
 core.sharedRepository::
 	When 'group' (or 'true'), the repository is made shareable between
 	several users in a group (making sure all the files and objects are
-	group-writable). When 'all' (or 'world' or 'everybody'), the
-	repository will be readable by all users, additionally to being
+	group-writable). When 'read-only-group', the repository is made
+	readable for users in a group. When 'all' (or 'world' or 'everybody'),
+	the repository will be readable by all users, additionally to being
 	group-shareable. When 'umask' (or 'false'), git will use permissions
 	reported by umask(2). See linkgit:git-init[1]. False by default.
 
diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt
index 62914da..e0613f9 100644
--- a/Documentation/git-init.txt
+++ b/Documentation/git-init.txt
@@ -31,7 +31,7 @@ structure, some suggested "exclude patterns", and copies of non-executing
 "hook" files.  The suggested patterns and hook files are all modifiable and
 extensible.
 
---shared[={false|true|umask|group|all|world|everybody}]::
+--shared[={false|true|umask|group|read-only-group|all|world|everybody}]::
 
 Specify that the git repository is to be shared amongst several users.  This
 allows users belonging to the same group to push into that
@@ -49,6 +49,9 @@ is given:
  - 'group' (or 'true'): Make the repository group-writable, (and g+sx, since
    the git group may be not the primary group of all users).
 
+ - 'read-only-group': Make the repository group-readable (and g+sx for
+   directories)
+
  - 'all' (or 'world' or 'everybody'): Same as 'group', but make the repository
    readable by all users.
 
diff --git a/cache.h b/cache.h
index 2a1e7ec..37f5e4a 100644
--- a/cache.h
+++ b/cache.h
@@ -477,7 +477,8 @@ int git_mkstemp(char *path, size_t n, const char *template);
 enum sharedrepo {
 	PERM_UMASK = 0,
 	PERM_GROUP,
-	PERM_EVERYBODY
+	PERM_EVERYBODY,
+	PERM_READONLY_GROUP,
 };
 int git_config_perm(const char *var, const char *value);
 int adjust_shared_perm(const char *path);
diff --git a/path.c b/path.c
index f4ed979..d3d68b8 100644
--- a/path.c
+++ b/path.c
@@ -266,22 +266,27 @@ int adjust_shared_perm(const char *path)
 	if (lstat(path, &st) < 0)
 		return -1;
 	mode = st.st_mode;
-	if (mode & S_IRUSR)
-		mode |= (shared_repository == PERM_GROUP
-			 ? S_IRGRP
-			 : (shared_repository == PERM_EVERYBODY
-			    ? (S_IRGRP|S_IROTH)
-			    : 0));
-
-	if (mode & S_IWUSR)
+	if (mode & S_IRUSR) {
+		if (shared_repository == PERM_GROUP ||
+		    shared_repository == PERM_READONLY_GROUP) {
+			mode |= S_IRGRP;
+		} else if (shared_repository == PERM_EVERYBODY) {
+			mode |= S_IRGRP | S_IROTH;
+		}
+	}
+
+	if ((mode & S_IWUSR) && shared_repository != PERM_READONLY_GROUP)
 		mode |= S_IWGRP;
 
-	if (mode & S_IXUSR)
-		mode |= (shared_repository == PERM_GROUP
-			 ? S_IXGRP
-			 : (shared_repository == PERM_EVERYBODY
-			    ? (S_IXGRP|S_IXOTH)
-			    : 0));
+	if (mode & S_IXUSR) {
+		if (shared_repository == PERM_GROUP ||
+		    shared_repository == PERM_READONLY_GROUP) {
+			mode |= S_IXGRP;
+		} else if (shared_repository == PERM_EVERYBODY) {
+			mode |= S_IXGRP | S_IXOTH;
+		}
+	}
+
 	if (S_ISDIR(mode))
 		mode |= FORCE_DIR_SET_GID;
 	if ((mode & st.st_mode) != mode && chmod(path, mode) < 0)
diff --git a/setup.c b/setup.c
index 3d2d958..f5d05dc 100644
--- a/setup.c
+++ b/setup.c
@@ -434,6 +434,8 @@ int git_config_perm(const char *var, const char *value)
 			return PERM_UMASK;
 		if (!strcmp(value, "group"))
 			return PERM_GROUP;
+		if (!strcmp(value, "read-only-group"))
+			return PERM_READONLY_GROUP;
 		if (!strcmp(value, "all") ||
 		    !strcmp(value, "world") ||
 		    !strcmp(value, "everybody"))
-- 
1.5.4.4