Code

Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1
authorJunio C Hamano <gitster@pobox.com>
Sun, 22 Mar 2009 05:53:36 +0000 (22:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Mar 2009 05:53:36 +0000 (22:53 -0700)
commit2990034f1ed2c3d85d23d5611a1f04d317f785ac
treeb279df7a87a679a74c942f1c32d42681f9317f4b
parentbf0fe35c938ac9f03d1369600b0c76e428a57507
parent2c626e5fa8a46f647b88fb32d7b28d573e8631bf
Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1

* jc/maint-1.6.0-pack-directory:
  Fix odb_mkstemp() on AIX
  Make sure objects/pack exists before creating a new pack

Conflicts:
wrapper.c
builtin-pack-objects.c
fast-import.c
git-compat-util.h
index-pack.c
pack-write.c
t/t5300-pack-object.sh
wrapper.c