summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Nezhdanov <snake@penza-gsm.ru>2005-05-02 04:23:04 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-02 04:23:04 (GMT)
commitbab5583a49bff27c53f9ab22489b7faae21f607d (patch)
treef02cec371d16a9993bd7a9fc15b47928d2946ee5
parentb02a26cb877319f0367725ce87aead42488714cb (diff)
downloadgit-bab5583a49bff27c53f9ab22489b7faae21f607d.zip
git-bab5583a49bff27c53f9ab22489b7faae21f607d.tar.gz
git-bab5583a49bff27c53f9ab22489b7faae21f607d.tar.bz2
[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>
-rw-r--r--cat-file.c8
-rw-r--r--export.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/cat-file.c b/cat-file.c
index 6ff9d55..be41f51 100644
--- a/cat-file.c
+++ b/cat-file.c
@@ -13,7 +13,7 @@ int main(int argc, char **argv)
unsigned long size;
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])) {
buf = read_sha1_file(sha1, type, &size);
@@ -28,7 +28,7 @@ int main(int argc, char **argv)
}
if (!buf)
- die("cat-file %s: bad file", argv[2]);
+ die("git-cat-file %s: bad file", argv[2]);
while (size > 0) {
long ret = write(1, buf, size);
@@ -38,9 +38,9 @@ int main(int argc, char **argv)
/* Ignore epipe */
if (errno == EPIPE)
break;
- die("cat-file: %s", strerror(errno));
+ die("git-cat-file: %s", strerror(errno));
} else if (!ret) {
- die("cat-file: disk full?");
+ die("git-cat-file: disk full?");
}
size -= ret;
buf += ret;
diff --git a/export.c b/export.c
index 78bfe9f..b648717 100644
--- 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);