mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'ew/config-protect-mode'
* ew/config-protect-mode: config: preserve config file permissions on edits
This commit is contained in:
commit
a3c0efec9b
16
config.c
16
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;
|
||||
|
|
|
@ -1158,4 +1158,14 @@ test_expect_failure 'adding a key into an empty section reuses header' '
|
|||
test_cmp expect .git/config
|
||||
'
|
||||
|
||||
test_expect_success POSIXPERM,PERL 'preserves existing permissions' '
|
||||
chmod 0600 .git/config &&
|
||||
git config imap.pass Hunter2 &&
|
||||
perl -e \
|
||||
"die q(badset) if ((stat(q(.git/config)))[2] & 07777) != 0600" &&
|
||||
git config --rename-section imap pop &&
|
||||
perl -e \
|
||||
"die q(badrename) if ((stat(q(.git/config)))[2] & 07777) != 0600"
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Loading…
Reference in a new issue