Merge branch 'rs/archive-tree-in-tip-simplify'
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 May 2012 20:35:22 +0000 (13:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 May 2012 20:35:22 +0000 (13:35 -0700)
By René Scharfe
* rs/archive-tree-in-tip-simplify:
archive-tar: keep const in checksum calculation
archive: simplify refname handling

1  2 
archive-tar.c
archive.c
diff --cc archive-tar.c
Simple merge
diff --cc archive.c
Simple merge