Merge branch 'maint'

diff --git a/sha1_file.c b/sha1_file.c
index 11969fc161bb56af410a76f0791dc9cb3bec0e1b..f708cf4f674fdf393044d6c36c7d97f1fa7dcd0c 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2225,7 +2225,7 @@ int move_temp_to_file(const char *tmpfile, const char *filename)
 {
        int ret = 0;
 
-       if (unreliable_hardlinks)
+       if (object_creation_mode == OBJECT_CREATION_USES_RENAMES)
                goto try_rename;
        else if (link(tmpfile, filename))
                ret = errno;