Split "git-pull-script" into two parts

diff --git a/export.c b/export.c
index 885f4e88fc93368862c44f359b7149c576e0c841..b6487177d3cad0de3a5a88b0bd0fd3c9cfc22948 100644 (file)
--- a/export.c
+++ b/export.c
@@ -12,7 +12,7 @@ void show_commit(struct commit *commit)
        strcpy(hex, sha1_to_hex(commit->object.sha1));
        printf("Id: %s\n", hex);
        fflush(NULL);
-       sprintf(cmdline, "cat-file commit %s", hex);
+       sprintf(cmdline, "git-cat-file commit %s", hex);
        system(cmdline);
        if (commit->parents) {
                char *against = sha1_to_hex(commit->parents->item->object.sha1);
@@ -73,8 +73,8 @@ int main(int argc, char **argv)
        unsigned char top_sha1[20];
 
        if (argc < 2 || argc > 4 ||
-           get_sha1_hex(argv[1], top_sha1) ||
-           (argc == 3 && get_sha1_hex(argv[2], base_sha1)))
+           get_sha1(argv[1], top_sha1) ||
+           (argc == 3 && get_sha1(argv[2], base_sha1)))
                usage("git-export top [base]");
        export(get_commit(top_sha1), argc==3 ? get_commit(base_sha1) : NULL);
        return 0;