Skip to content

Commit

Permalink
Merge branch 'kb/avoid-fchmod-for-now'
Browse files Browse the repository at this point in the history
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()
  • Loading branch information
Junio C Hamano committed Jul 21, 2014
2 parents 80e8575 + 2569d23 commit fb0166c
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions config.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit fb0166c

Please sign in to comment.