Merge branch 'jc/index-pack-reject-dups'
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2011 23:13:42 +0000 (15:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2011 23:13:42 +0000 (15:13 -0800)
* jc/index-pack-reject-dups:
  receive-pack, fetch-pack: reject bogus pack that records objects twice

1  2 
pack.h

diff --cc pack.h
Simple merge