Merge branch 'np/pack'

* np/pack:
  pack-objects: get rid of an ugly cast
  make the pack index version configurable

Conflicts:

	builtin-pack-objects.c

diff --cc builtin-pack-objects.c
index 25ec65d0f0e89f795329feae2a3eac04ca96a976,d0ca165c9b683863244dc6d7d71aec4bfad14227..545ece5da75672f435d018ccb534bc8c342bbf3d
--- 1/builtin-pack-objects.c
--- 2/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@@ -598,8 -606,8 +598,8 @@@ static void write_pack_file(void
        uint32_t nr_remaining = nr_result;
  
        if (do_progress)
 -              start_progress(&progress_state, "Writing %u objects...", "", nr_result);
 +              progress_state = start_progress("Writing objects", nr_result);
-       written_list = xmalloc(nr_objects * sizeof(struct object_entry *));
+       written_list = xmalloc(nr_objects * sizeof(*written_list));
  
        do {
                unsigned char sha1[20];

diff --cc index-pack.c
index 61ea7621bef3d653b3b88ba89801305b95a8d1a7,c0bb78a8ed360312fbba7a75c559aa13e224ccd5..715a5bb7a6e42694b3e35de703e44e792a5442fe
--- 1/index-pack.c
--- 2/index-pack.c
+++ b/index-pack.c
@@@ -693,8 -704,10 +704,10 @@@ int main(int argc, char **argv
        struct pack_idx_entry **idx_objects;
        unsigned char sha1[20];
  
+       git_config(git_index_pack_config);
+ 
        for (i = 1; i < argc; i++) {
 -              const char *arg = argv[i];
 +              char *arg = argv[i];
  
                if (*arg == '-') {
                        if (!strcmp(arg, "--stdin")) {