Make merge-cache not fail immediatelly when the merge program

[git.git] / sha1_file.c

diff --git a/sha1_file.c b/sha1_file.c
index 8f57798..f1c1c70 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -9,8 +9,6 @@
 #include <stdarg.h>
 #include "cache.h"
 
-const char *sha1_file_directory = NULL;
-
 #ifndef O_NOATIME
 #if defined(__linux__) && (defined(__i386__) || defined(__PPC__))
 #define O_NOATIME 01000000
@@ -353,8 +351,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) {