Merge branch 'jk/haves-from-alternate-odb' into next
commit53b473559366b4d1cfe095803cf314e7bd0dcebf
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 May 2011 17:57:47 +0000 (23 10:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 May 2011 17:57:47 +0000 (23 10:57 -0700)
treec0d99ba65c574fba72427447bc391bdf921f0d5d
parentb56fb81f95d7d6ff3aa1773fb384e3e87284d712
parentcff38a5e11217dc997c1ffae8d0856023e05554a
Merge branch 'jk/haves-from-alternate-odb' into next

* jk/haves-from-alternate-odb:
  receive-pack: eliminate duplicate .have refs
  bisect: refactor sha1_array into a generic sha1 list
  refactor refs_from_alternate_cb to allow passing extra data
Makefile
builtin/fetch-pack.c