Add merge-subtree back

diff --git a/sha1_name.c b/sha1_name.c
index 13e11645e1fd6b61812cc3e88d2ad6cd42cad9ce..be8489e4e5fc98c6e38036a40fb5ca8c0db77ebc 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -695,7 +695,7 @@ int get_sha1_with_mode(const char *name, unsigned char *sha1, unsigned *mode)
                                break;
                        if (ce_stage(ce) == stage) {
                                hashcpy(sha1, ce->sha1);
-                               *mode = ntohl(ce->ce_mode);
+                               *mode = ce->ce_mode;
                                return 0;
                        }
                        pos++;