Merge branch 'jn/thinner-wrapper'
authorJunio C Hamano <gitster@pobox.com>
Sat, 4 Dec 2010 00:13:06 +0000 (3 16:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 4 Dec 2010 00:13:06 +0000 (3 16:13 -0800)
* jn/thinner-wrapper:
  Remove pack file handling dependency from wrapper.o
  pack-objects: mark file-local variable static
  wrapper: give zlib wrappers their own translation unit
  strbuf: move strbuf_branchname to sha1_name.c
  path helpers: move git_mkstemp* to wrapper.c
  wrapper: move odb_* to environment.c
  wrapper: move xmmap() to sha1_file.c

1  2 
Makefile
builtin/pack-objects.c
environment.c
git-compat-util.h
sha1_file.c
sha1_name.c

diff --cc Makefile
Simple merge
Simple merge
diff --cc environment.c
Simple merge
Simple merge
diff --cc sha1_file.c
Simple merge
diff --cc sha1_name.c
Simple merge