move_temp_to_file(): do not forget to chmod() in "Coda hack" codepath

Now move_temp_to_file() is responsible for doing everything that is
necessary to turn a tempfile in $GIT_DIR into its final form, it must make
sure "Coda hack" codepath correctly makes the file read-only.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/sha1_file.c b/sha1_file.c
index 3bd20e715b785ab315e734c4ad5a18611e16cdf5..6f278593e5ecf6cfb4367fd0a3fd0b9eeefe9da6 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2263,12 +2263,12 @@ int move_temp_to_file(const char *tmpfile, const char *filename)
         *
         * The same holds for FAT formatted media.
         *
         *
         * The same holds for FAT formatted media.
         *

-        * When this succeeds, we just return 0. We have nothing
+        * When this succeeds, we just return.  We have nothing

         * left to unlink.
         */
        if (ret && ret != EEXIST) {
                if (!rename(tmpfile, filename))
         * left to unlink.
         */
        if (ret && ret != EEXIST) {
                if (!rename(tmpfile, filename))

-                       return 0;
+                       goto out;

                ret = errno;
        }
        unlink(tmpfile);
                ret = errno;
        }
        unlink(tmpfile);


@@ -2279,6 +2279,7 @@ int move_temp_to_file(const char *tmpfile, const char *filename)
                /* FIXME!!! Collision check here ? */
        }
 
                /* FIXME!!! Collision check here ? */
        }
 

+out:

        if (chmod(filename, 0444) || adjust_shared_perm(filename))
                return error("unable to set permission to '%s'", filename);
        return 0;
        if (chmod(filename, 0444) || adjust_shared_perm(filename))
                return error("unable to set permission to '%s'", filename);
        return 0;