expose a helper function peel_to_type().

diff --git a/merge-index.c b/merge-index.c
index 5599fd321bb4c09c1c0ce4fc62dfb9ecf5531c2b..bbb700b54eab2a14f60e090231a196874ff3a9e0 100644 (file)
--- a/merge-index.c
+++ b/merge-index.c
@@ -25,7 +25,7 @@ static void run_program(void)
 static int merge_entry(int pos, const char *path)
 {
        int found;
-       
+
        if (pos >= active_nr)
                die("git-merge-index: %s not in the cache", path);
        arguments[0] = pgm;
@@ -48,7 +48,7 @@ static int merge_entry(int pos, const char *path)
                        break;
                found++;
                strcpy(hexbuf[stage], sha1_to_hex(ce->sha1));
-               sprintf(ownbuf[stage], "%o", ntohl(ce->ce_mode));
+               sprintf(ownbuf[stage], "%o", ce->ce_mode);
                arguments[stage] = hexbuf[stage];
                arguments[stage + 4] = ownbuf[stage];
        } while (++pos < active_nr);