Work around missing hard links on FAT formatted media

FAT -- like Coda -- does not like cross-directory hard links. To be
precise, FAT does not like links at all. But links are not needed either.
So get rid of them.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/clone-pack.c b/clone-pack.c
index 4f4975b4ab7faecb172482f308999e48ea643d37..960921903eaa712523af0b03098970127729f363 100644 (file)
--- a/clone-pack.c
+++ b/clone-pack.c
@@ -211,7 +211,7 @@ static int clone_without_unpack(int fd[2])
 
        ifd = fd[0];
        snprintf(tmpfile, sizeof(tmpfile),
 
        ifd = fd[0];
        snprintf(tmpfile, sizeof(tmpfile),

-                "%s/pack-XXXXXX", get_object_directory());
+                "%s/pack/tmp-XXXXXX", get_object_directory());

        ofd = mkstemp(tmpfile);
        if (ofd < 0)
                return error("unable to create temporary file %s", tmpfile);
        ofd = mkstemp(tmpfile);
        if (ofd < 0)
                return error("unable to create temporary file %s", tmpfile);

diff --git a/sha1_file.c b/sha1_file.c
index e45679975e7fcbfae0497f25ab56b6bbd0ff1155..7fdc46969d718096f6492f08489ae20b9693c64b 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1239,11 +1239,14 @@ int move_temp_to_file(const char *tmpfile, char *filename)
                 * won't be able to check collisions, but that's not a
                 * big deal.
                 *
                 * won't be able to check collisions, but that's not a
                 * big deal.
                 *

+                * The same holds for FAT formatted media.
+                *

                 * When this succeeds, we just return 0. We have nothing
                 * left to unlink.
                 */
                 * When this succeeds, we just return 0. We have nothing
                 * left to unlink.
                 */

-               if (ret == EXDEV && !rename(tmpfile, filename))
+               if ((ret == EXDEV || ret == ENOTSUP) && !rename(tmpfile, filename))

                        return 0;
                        return 0;

+               ret = errno;

        }
        unlink(tmpfile);
        if (ret) {
        }
        unlink(tmpfile);
        if (ret) {