Merge branch 'hv/submodule-alt-odb'
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 May 2012 20:35:05 +0000 (13:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 May 2012 20:35:06 +0000 (13:35 -0700)
When peeking into object stores of submodules, the code forgot that they
might borrow objects from alternate object stores on their own.

By Heiko Voigt
* hv/submodule-alt-odb:
  teach add_submodule_odb() to look for alternates

1  2 
cache.h
sha1_file.c
submodule.c

diff --cc cache.h
Simple merge
diff --cc sha1_file.c
Simple merge
diff --cc submodule.c
Simple merge