Merge branch 'maint'

diff --git a/builtin-rerere.c b/builtin-rerere.c
index f6409b93c19aff7f8d820e52e39f45d717e31996..29fb075d29d2deb849e51578e2818d44dbb2a0d5 100644 (file)
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
@@ -57,7 +57,8 @@ static int write_rr(struct path_list *rr, int out_fd)
                    write_in_full(out_fd, path, length) != length)
                        die("unable to write rerere record");
        }
-       close(out_fd);
+       if (close(out_fd) != 0)
+               die("unable to write rerere record");
        return commit_lock_file(&write_lock);
 }