mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix 'quickfix' on pack-objects.

Browse Source 
The earlier quickfix forced world-readable permission bits.  This
updates it to honor umask and core.sharedrepository settings.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2007-04-22 12:28:34 -07:00
parent aef5aedd85
commit b6b32ccb92
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
builtin-pack-objects.c
View File

@ -1612,6 +1612,13 @@ static void get_object_list(int ac, const char **av)
traverse_commit_list(&revs, show_commit, show_object); traverse_commit_list(&revs, show_commit, show_object);
} }
static int adjust_perm(const char *path, mode_t mode)
{
if (chmod(path, mode))
return -1;
return adjust_shared_perm(path);
}
int cmd_pack_objects(int argc, const char **argv, const char *prefix) int cmd_pack_objects(int argc, const char **argv, const char *prefix)
{ {
int depth = 10; int depth = 10;
@ -1780,10 +1787,15 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
last_obj_offset = write_pack_file(); last_obj_offset = write_pack_file();
if (!pack_to_stdout) { if (!pack_to_stdout) {
unsigned char object_list_sha1[20]; unsigned char object_list_sha1[20];
mode_t mode = umask(0);
umask(mode);
mode = 0666 & ~mode;
write_index_file(last_obj_offset, object_list_sha1); write_index_file(last_obj_offset, object_list_sha1);
snprintf(tmpname, sizeof(tmpname), "%s-%s.pack", snprintf(tmpname, sizeof(tmpname), "%s-%s.pack",
base_name, sha1_to_hex(object_list_sha1)); base_name, sha1_to_hex(object_list_sha1));
if (chmod(pack_tmp_name, 0644)) if (adjust_perm(pack_tmp_name, mode))
die("unable to make temporary pack file readable: %s", die("unable to make temporary pack file readable: %s",
strerror(errno)); strerror(errno));
if (rename(pack_tmp_name, tmpname)) if (rename(pack_tmp_name, tmpname))
@ -1791,7 +1803,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
strerror(errno)); strerror(errno));
snprintf(tmpname, sizeof(tmpname), "%s-%s.idx", snprintf(tmpname, sizeof(tmpname), "%s-%s.idx",
base_name, sha1_to_hex(object_list_sha1)); base_name, sha1_to_hex(object_list_sha1));
if (chmod(idx_tmp_name, 0644)) if (adjust_perm(idx_tmp_name, mode))
die("unable to make temporary index file readable: %s", die("unable to make temporary index file readable: %s",
strerror(errno)); strerror(errno));
if (rename(idx_tmp_name, tmpname)) if (rename(idx_tmp_name, tmpname))