Merge branch 'maint-1.6.0' into maint-1.6.1

diff --git a/sha1_file.c b/sha1_file.c
index b63f842cbdaf01e8a3b0ba35cbfc1ad0cbac6913..3d93d936e4e3ddf24f46af2ef92e62e5f7db3877 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2298,7 +2298,7 @@ static void close_sha1_file(int fd)
                fsync_or_die(fd, "sha1 file");
        fchmod(fd, 0444);
        if (close(fd) != 0)
-               die("unable to write sha1 file");
+               die("error when closing sha1 file (%s)", strerror(errno));
 }
 
 /* Size of directory component, including the ending '/' */