diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-07-21 11:18:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-21 11:18:54 -0700 |
| commit | fb0166c674efbc940ac14453129ab81823badf3d (patch) | |
| tree | f141fcf947e3190ca7139bd0e4ad23a13add2cbb /config.c | |
| parent | Merge branch 'sk/mingw-uni-fix' (diff) | |
| parent | config: use chmod() instead of fchmod() (diff) | |
| download | tgif-fb0166c674efbc940ac14453129ab81823badf3d.tar.xz | |
Merge branch 'kb/avoid-fchmod-for-now'
Replaces the only two uses of fchmod() with chmod() because the
former does not work on Windows port and because luckily we can.
* kb/avoid-fchmod-for-now:
config: use chmod() instead of fchmod()
Diffstat (limited to 'config.c')
| -rw-r--r-- | config.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1636,8 +1636,8 @@ 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", + if (chmod(lock->filename, st.st_mode & 07777) < 0) { + error("chmod on %s failed: %s", lock->filename, strerror(errno)); ret = CONFIG_NO_WRITE; goto out_free; @@ -1815,8 +1815,8 @@ int git_config_rename_section_in_file(const char *config_filename, fstat(fileno(config_file), &st); - if (fchmod(out_fd, st.st_mode & 07777) < 0) { - ret = error("fchmod on %s failed: %s", + if (chmod(lock->filename, st.st_mode & 07777) < 0) { + ret = error("chmod on %s failed: %s", lock->filename, strerror(errno)); goto out; } |