From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Tue, 3 May 2005 22:16:18 +0000 (-0700)
Subject: sha1_file: make the new sha1 object writing be coda-friendly.
X-Git-Tag: v0.99~652
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a31c6d022e2435a514fcc8ca57f9995c4376a986;p=git.git

sha1_file: make the new sha1 object writing be coda-friendly.

Coda doesn't like cross-directory hardlinks. So try to fall back
on a plain rename instead.
---

diff --git a/sha1_file.c b/sha1_file.c
index 8f577985a..e6ce455ae 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -353,8 +353,21 @@ int write_sha1_file(char *buf, unsigned long len, const char *type, unsigned cha
 	close(fd);
 
 	ret = link(tmpfile, filename);
-	if (ret < 0)
+	if (ret < 0) {
 		ret = errno;
+
+		/*
+		 * Coda hack - coda doesn't like cross-directory links,
+		 * so we fall back to a rename, which will mean that it
+		 * won't be able to check collisions, but that's not a
+		 * big deal.
+		 *
+		 * When this succeeds, we just return 0. We have nothing
+		 * left to unlink.
+		 */
+		if (ret == EXDEV && !rename(tmpfile, filename))
+			return 0;
+	}
 	unlink(tmpfile);
 	if (ret) {
 		if (ret != EEXIST) {