Merge branch 'jc/pack-objects'

diff --cc builtin-pack-objects.c
Simple merge

diff --cc builtin-unpack-objects.c
index 09d264d9f2cc19b3bab245bb68c639cec3d1b57c,b23fe58ce158acdeb077be94fd58ed80a3c2b698..63f4b8e45d1cb80042583fba382acc7f4f1f952c
--- 1/builtin-unpack-objects.c
--- 2/unpack-objects.c
+++ b/builtin-unpack-objects.c
@@@ -266,6 -265,9 +266,8 @@@ int cmd_unpack_objects(int argc, const 
        int i;
        unsigned char sha1[20];
  
 -      setup_git_directory();
+       git_config(git_default_config);
+ 
        quiet = !isatty(2);
  
        for (i = 1 ; i < argc; i++) {

diff --cc cache.h
Simple merge

diff --cc sha1_file.c
Simple merge