aboutsummaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-03 12:06:46 -0700
committerJunio C Hamano <gitster@pobox.com>2014-06-03 12:06:46 -0700
commita3c0efec9b35a7db41537cc9f80e3ebb7ce2fbfe (patch)
treeddef27bb25cf2674591f500875a91bdb90ee081d /config.c
parentd6850db3c27e4d6c591f046d998f5dc7cc883047 (diff)
parentdaa22c6f8da466bd7a438f1bc27375fd737ffcf3 (diff)
downloadgit-a3c0efec9b35a7db41537cc9f80e3ebb7ce2fbfe.tar.gz
git-a3c0efec9b35a7db41537cc9f80e3ebb7ce2fbfe.tar.xz
Merge branch 'ew/config-protect-mode'
* ew/config-protect-mode: config: preserve config file permissions on edits
Diffstat (limited to 'config.c')
-rw-r--r--config.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/config.c b/config.c
index a30cb5c07..c227aa851 100644
--- a/config.c
+++ b/config.c
@@ -1636,6 +1636,13 @@ int git_config_set_multivar_in_file(const char *config_filename,
MAP_PRIVATE, in_fd, 0);
close(in_fd);
+ if (fchmod(fd, st.st_mode & 07777) < 0) {
+ error("fchmod on %s failed: %s",
+ lock->filename, strerror(errno));
+ ret = CONFIG_NO_WRITE;
+ goto out_free;
+ }
+
if (store.seen == 0)
store.seen = 1;
@@ -1784,6 +1791,7 @@ int git_config_rename_section_in_file(const char *config_filename,
int out_fd;
char buf[1024];
FILE *config_file;
+ struct stat st;
if (new_name && !section_name_is_ok(new_name)) {
ret = error("invalid section name: %s", new_name);
@@ -1805,6 +1813,14 @@ int git_config_rename_section_in_file(const char *config_filename,
goto unlock_and_out;
}
+ fstat(fileno(config_file), &st);
+
+ if (fchmod(out_fd, st.st_mode & 07777) < 0) {
+ ret = error("fchmod on %s failed: %s",
+ lock->filename, strerror(errno));
+ goto out;
+ }
+
while (fgets(buf, sizeof(buf), config_file)) {
int i;
int length;