summaryrefslogtreecommitdiff
path: root/http-push.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-10-23 13:32:17 -0700
committerJunio C Hamano <gitster@pobox.com>2013-10-23 13:32:17 -0700
commit6ba0d9551a2963a6fed83b90b55a373d79ef46d0 (patch)
tree528a196ba43fa7a9d519e2a2a2864a64ebd25091 /http-push.c
parent5f737ac91bd869e65bff401ad1108581ac504e22 (diff)
parentf21d2a786b7fa6e53bb09e6466185b26f7f30d98 (diff)
downloadgit-6ba0d9551a2963a6fed83b90b55a373d79ef46d0.tar.gz
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
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 6dad188b5f..cde6416d37 100644
--- a/http-push.c
+++ b/http-push.c
@@ -1976,7 +1976,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();