[PATCH] git-export complains about mising cat-file
Fixes bits leaved during name change. Signed-off-by: Alexey Nezhdanov <snake@penza-gsm.ru> Signed-off-by: Linus Torvalds <torvalds@osdl.org>maint
parent
b02a26cb87
commit
bab5583a49
|
@ -13,7 +13,7 @@ int main(int argc, char **argv)
|
||||||
unsigned long size;
|
unsigned long size;
|
||||||
|
|
||||||
if (argc != 3 || get_sha1(argv[2], sha1))
|
if (argc != 3 || get_sha1(argv[2], sha1))
|
||||||
usage("cat-file [-t | tagname] <sha1>");
|
usage("git-cat-file [-t | tagname] <sha1>");
|
||||||
|
|
||||||
if (!strcmp("-t", argv[1])) {
|
if (!strcmp("-t", argv[1])) {
|
||||||
buf = read_sha1_file(sha1, type, &size);
|
buf = read_sha1_file(sha1, type, &size);
|
||||||
|
@ -28,7 +28,7 @@ int main(int argc, char **argv)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!buf)
|
if (!buf)
|
||||||
die("cat-file %s: bad file", argv[2]);
|
die("git-cat-file %s: bad file", argv[2]);
|
||||||
|
|
||||||
while (size > 0) {
|
while (size > 0) {
|
||||||
long ret = write(1, buf, size);
|
long ret = write(1, buf, size);
|
||||||
|
@ -38,9 +38,9 @@ int main(int argc, char **argv)
|
||||||
/* Ignore epipe */
|
/* Ignore epipe */
|
||||||
if (errno == EPIPE)
|
if (errno == EPIPE)
|
||||||
break;
|
break;
|
||||||
die("cat-file: %s", strerror(errno));
|
die("git-cat-file: %s", strerror(errno));
|
||||||
} else if (!ret) {
|
} else if (!ret) {
|
||||||
die("cat-file: disk full?");
|
die("git-cat-file: disk full?");
|
||||||
}
|
}
|
||||||
size -= ret;
|
size -= ret;
|
||||||
buf += ret;
|
buf += ret;
|
||||||
|
|
2
export.c
2
export.c
|
@ -12,7 +12,7 @@ void show_commit(struct commit *commit)
|
||||||
strcpy(hex, sha1_to_hex(commit->object.sha1));
|
strcpy(hex, sha1_to_hex(commit->object.sha1));
|
||||||
printf("Id: %s\n", hex);
|
printf("Id: %s\n", hex);
|
||||||
fflush(NULL);
|
fflush(NULL);
|
||||||
sprintf(cmdline, "cat-file commit %s", hex);
|
sprintf(cmdline, "git-cat-file commit %s", hex);
|
||||||
system(cmdline);
|
system(cmdline);
|
||||||
if (commit->parents) {
|
if (commit->parents) {
|
||||||
char *against = sha1_to_hex(commit->parents->item->object.sha1);
|
char *against = sha1_to_hex(commit->parents->item->object.sha1);
|
||||||
|
|
Loading…
Reference in New Issue