Merge branch 'maint'

[git.git] / sha1_file.c

diff --git a/sha1_file.c b/sha1_file.c
index 9ee1ed16ad2df8847bd5008a5d61c807c145357a..aec81bbae7628574e997fc3a6c9f5ae3dda2476d 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2136,7 +2136,9 @@ static void write_sha1_file_prepare(const void *buf, unsigned long len,
  */
 int move_temp_to_file(const char *tmpfile, const char *filename)
 {
-       int ret = link(tmpfile, filename);
+       int ret = 0;
+       if (link(tmpfile, filename))
+               ret = errno;
 
        /*
         * Coda hack - coda doesn't like cross-directory links,