Merge branch 'jc/pack-objects'
authorJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 02:33:16 +0000 (19:33 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 02:33:16 +0000 (19:33 -0700)
1  2 
builtin-pack-objects.c
builtin-unpack-objects.c
cache.h
sha1_file.c

Simple merge
@@@ -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