X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=pack-objects.c;h=caf3b6be5a1cf85bafd034ed9e2cbe3cd596b26c;hb=975b31dc6e12fba8f7b067ddbe32230995e05400;hp=4e941e7392077dca9b511282be13e2b559589e5b;hpb=f3123c4ab3d3698262e59561ac084de45b10365a;p=git.git diff --git a/pack-objects.c b/pack-objects.c index 4e941e73..caf3b6be 100644 --- a/pack-objects.c +++ b/pack-objects.c @@ -4,7 +4,7 @@ #include "pack.h" #include "csum-file.h" -static const char pack_usage[] = "git-pack-objects [--local] [--incremental] [--window=N] [--depth=N] {--stdout | base-name} < object-list"; +static const char pack_usage[] = "git-pack-objects [--non-empty] [--local] [--incremental] [--window=N] [--depth=N] {--stdout | base-name} < object-list"; struct object_entry { unsigned char sha1[20]; @@ -473,6 +473,8 @@ int main(int argc, char **argv) struct object_entry **list; int i; + setup_git_directory(); + for (i = 1; i < argc; i++) { const char *arg = argv[i]; @@ -524,7 +526,7 @@ int main(int argc, char **argv) unsigned char sha1[20]; if (get_sha1_hex(line, sha1)) - die("expected sha1, got garbage"); + die("expected sha1, got garbage:\n %s", line); hash = 0; p = line+40; while (*p) {