summaryrefslogtreecommitdiff
path: root/http-push.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-20 12:25:32 -0700
committerJunio C Hamano <gitster@pobox.com>2013-09-20 12:25:32 -0700
commit238504b014230d0bc244fb0de84990863fcddd59 (patch)
tree59fee63d5862631a00b91a9e7045fa5935430dd2 /http-push.c
parent79e46c9fed837c565eac8d81448641d6b944a928 (diff)
parentf21d2a786b7fa6e53bb09e6466185b26f7f30d98 (diff)
downloadgit-238504b014230d0bc244fb0de84990863fcddd59.tar.gz
Merge branch 'nd/fetch-into-shallow'
When there is no sufficient overlap between old and new history during a fetch into a shallow repository, we unnecessarily sent objects the sending side knows the receiving end has. * 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
Diffstat (limited to 'http-push.c')
-rw-r--r--http-push.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/http-push.c b/http-push.c
index eea158a878..69200baf76 100644
--- a/http-push.c
+++ b/http-push.c
@@ -1975,7 +1975,7 @@ int main(int argc, char **argv)
pushing = 0;
if (prepare_revision_walk(&revs))
die("revision walk setup failed");
- mark_edges_uninteresting(revs.commits, &revs, NULL);
+ mark_edges_uninteresting(&revs, NULL);
objects_to_send = get_delta(&revs, ref_lock);
finish_all_active_slots();