From: Thomas Rast <trast@student.ethz.ch>
Date: Thu, 18 Sep 2008 22:24:46 +0000 (+0200)
Subject: sha1_file: link() returns -1 on failure, not errno
X-Git-Tag: v1.6.0.3~83
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e32c0a9c38a126c9eb8ff8f2fdc1fb8875400bbe;p=git.git

sha1_file: link() returns -1 on failure, not errno

5723fe7 (Avoid cross-directory renames and linking on object creation,
2008-06-14) changed the call to use link() directly instead of through a
custom wrapper, but forgot that it returns 0 or -1, not 0 or errno.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/sha1_file.c b/sha1_file.c
index 477d3fb4b..e2cb342a3 100644
--- 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,