X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=export.c;h=ce10b5a298699897bfefa4a5093f92b8c9501450;hb=34155390a576d8124e0adc864aaf2f11bbf5168b;hp=885f4e88fc93368862c44f359b7149c576e0c841;hpb=aed7a5a9dab96d1a17be4fadf7685086047178cc;p=git.git diff --git a/export.c b/export.c index 885f4e88..ce10b5a2 100644 --- a/export.c +++ b/export.c @@ -4,7 +4,7 @@ /* * Show one commit */ -void show_commit(struct commit *commit) +static void show_commit(struct commit *commit) { char cmdline[400]; char hex[100]; @@ -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); @@ -27,7 +27,7 @@ void show_commit(struct commit *commit) /* * Show all unseen commits, depth-first */ -void show_unseen(struct commit *top) +static void show_unseen(struct commit *top) { struct commit_list *parents; @@ -42,7 +42,7 @@ void show_unseen(struct commit *top) show_commit(top); } -void export(struct commit *top, struct commit *base) +static void export(struct commit *top, struct commit *base) { mark_reachable(&top->object, 1); if (base) @@ -50,7 +50,7 @@ void export(struct commit *top, struct commit *base) show_unseen(top); } -struct commit *get_commit(unsigned char *sha1) +static struct commit *get_commit(unsigned char *sha1) { struct commit *commit = lookup_commit(sha1); if (!commit->object.parsed) { @@ -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;