On Thursday 26 March 2009, Junio C Hamano wrote:
> How about doing it like this, instead?
Looks good, and is obviously much less intrusive than my attempt.
There's still one issue as compared to my series: Hook scripts in
.git/hooks lose their executable bit when copied from template dir.
You probably need to do some kind of special x-bit handling, similar
to what's already done for directories.
Other than that:
Tested-by: Johan Herland <johan@xxxxxxxxxxx>
> I think there are more places you could sprinkle adjust_shared_perm() for
> packfiles and other things. I didn't check, not because I wasn't
> uninterested, but because I am more interested in getting what
> adjust_shared_perm() itself does right.
Here is my #7 patch, re-rolled on top of your patch to call
adjust_shared_perm():
---
fast-import.c | 2 ++
http-push.c | 1 +
http-walker.c | 1 +
index-pack.c | 2 ++
4 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/fast-import.c b/fast-import.c
index beeac0d..d73ee71 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -903,7 +903,9 @@ static char *keep_pack(char *curr_index_name)
int keep_fd;
chmod(pack_data->pack_name, 0444);
+ adjust_shared_perm(pack_data->pack_name);
chmod(curr_index_name, 0444);
+ adjust_shared_perm(curr_index_name);
keep_fd = odb_pack_keep(name, sizeof(name), pack_data->sha1);
if (keep_fd < 0)
diff --git a/http-push.c b/http-push.c
index 6ce5a1d..a5acabf 100644
--- a/http-push.c
+++ b/http-push.c
@@ -750,6 +750,7 @@ static void finish_request(struct transfer_request *request)
} else if (request->state == RUN_FETCH_LOOSE) {
fchmod(request->local_fileno, 0444);
close(request->local_fileno); request->local_fileno = -1;
+ adjust_shared_perm(request->tmpfile);
if (request->curl_result != CURLE_OK &&
request->http_code != 416) {
diff --git a/http-walker.c b/http-walker.c
index 0dbad3c..24cfc45 100644
--- a/http-walker.c
+++ b/http-walker.c
@@ -233,6 +233,7 @@ static void finish_object_request(struct object_request *obj_req)
fchmod(obj_req->local, 0444);
close(obj_req->local); obj_req->local = -1;
+ adjust_shared_perm(obj_req->tmpfile);
if (obj_req->http_code == 416) {
fprintf(stderr, "Warning: requested range invalid; we may already have all the data.\n");
diff --git a/index-pack.c b/index-pack.c
index 7546822..7abe3f0 100644
--- a/index-pack.c
+++ b/index-pack.c
@@ -826,6 +826,7 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
}
if (from_stdin)
chmod(final_pack_name, 0444);
+ adjust_shared_perm(final_pack_name);
if (final_index_name != curr_index_name) {
if (!final_index_name) {
@@ -837,6 +838,7 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
die("cannot store index file");
}
chmod(final_index_name, 0444);
+ adjust_shared_perm(final_index_name);
if (!from_stdin) {
printf("%s\n", sha1_to_hex(sha1));
--
1.6.2.1.473.g92672
--
Johan Herland, <johan@xxxxxxxxxxx>
www.herland.net
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
