]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/peel-ref'
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Mar 2013 21:01:02 +0000 (14:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Mar 2013 21:01:03 +0000 (14:01 -0700)
Recent optimization broke shallow clones.

* jk/peel-ref:
  upload-pack: load non-tip "want" objects from disk
  upload-pack: make sure "want" objects are parsed
  upload-pack: drop lookup-before-parse optimization

1  2 
t/t5500-fetch-pack.sh
upload-pack.c

Simple merge
diff --cc upload-pack.c
Simple merge