Merge branch 'mm/maint-hint-failed-merge' into maint

diff --git a/test-chmtime.c b/test-chmtime.c
index d5358cbaac2022483b74366555fc9707a7d8ad97..fe476cb6185a389671c014b4ea067184f51465d0 100644 (file)
--- a/test-chmtime.c
+++ b/test-chmtime.c
@@ -87,6 +87,15 @@ int main(int argc, const char *argv[])
                        return -1;
                }
 
+#ifdef WIN32
+               if (!(sb.st_mode & S_IWUSR) &&
+                               chmod(argv[i], sb.st_mode | S_IWUSR)) {
+                       fprintf(stderr, "Could not make user-writable %s: %s",
+                               argv[i], strerror(errno));
+                       return -1;
+               }
+#endif
+
                utb.actime = sb.st_atime;
                utb.modtime = set_eq ? set_time : sb.st_mtime + set_time;