Merge with http://members.cox.net/junkio/git-jc.git

[git.git] / convert-cache.c

diff --git a/convert-cache.c b/convert-cache.c
index 631d1aa..93e477a 100644 (file)
--- a/convert-cache.c
+++ b/convert-cache.c
@@ -99,7 +99,7 @@ static int write_subdirectory(void *buffer, unsigned long size, const char *base
                        continue;
                }
 
-               newlen += sprintf(new + newlen, "%o %.*s", S_IFDIR, slash - path, path);
+               newlen += sprintf(new + newlen, "%o %.*s", S_IFDIR, (int)(slash - path), path);
                new[newlen++] = 0;
                sha1 = (unsigned char *)(new + newlen);
                newlen += 20;
@@ -303,7 +303,7 @@ int main(int argc, char **argv)
        unsigned char sha1[20];
        struct entry *entry;
 
-       if (argc != 2 || get_sha1_hex(argv[1], sha1))
+       if (argc != 2 || get_sha1(argv[1], sha1))
                usage("convert-cache <sha1>");
 
        entry = convert_entry(sha1);