Merge fixes up to GIT 1.1.3

diff --git a/pack-objects.c b/pack-objects.c
index 8864a31cc14f4c57fe0115a0bfe73904fdb1ae12..c3f25317bbe8f9920220ab276a7605eeab132fb9 100644 (file)
--- 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];
@@ -119,7 +119,7 @@ static unsigned long write_one(struct sha1file *f,
                return offset;
        e->offset = offset;
        offset += write_object(f, e);
-       /* if we are delitified, write out its base object. */
+       /* if we are deltified, write out its base object. */
        if (e->delta)
                offset = write_one(f, e->delta, offset);
        return offset;
@@ -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];