Merge branch 'nd/fetch-into-shallow' into maint
commit6ba0d9551a2963a6fed83b90b55a373d79ef46d0
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Oct 2013 20:32:17 +0000 (23 13:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Oct 2013 20:32:17 +0000 (23 13:32 -0700)
tree528a196ba43fa7a9d519e2a2a2864a64ebd25091
parent5f737ac91bd869e65bff401ad1108581ac504e22
parentf21d2a786b7fa6e53bb09e6466185b26f7f30d98
Merge branch 'nd/fetch-into-shallow' into maint

When there is no sufficient overlap between old and new history
during a "git fetch" into a shallow repository, objects that the
sending side knows the receiving end has were unnecessarily sent.

* nd/fetch-into-shallow:
  Add testcase for needless objects during a shallow fetch
  list-objects: mark more commits as edges in mark_edges_uninteresting
  list-objects: reduce one argument in mark_edges_uninteresting
  upload-pack: delegate rev walking in shallow fetch to pack-objects
  shallow: add setup_temporary_shallow()
  shallow: only add shallow graft points to new shallow file
  move setup_alternate_shallow and write_shallow_commits to shallow.c
commit.h
fetch-pack.c
t/t5500-fetch-pack.sh
upload-pack.c