diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-20 12:25:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-20 12:25:32 -0700 |
| commit | 238504b014230d0bc244fb0de84990863fcddd59 (patch) | |
| tree | 59fee63d5862631a00b91a9e7045fa5935430dd2 /builtin/pack-objects.c | |
| parent | 79e46c9fed837c565eac8d81448641d6b944a928 (diff) | |
| parent | f21d2a786b7fa6e53bb09e6466185b26f7f30d98 (diff) | |
| download | git-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 'builtin/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 4eb0521c81..e86cd5729f 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -2378,7 +2378,7 @@ static void get_object_list(int ac, const char **av) if (prepare_revision_walk(&revs)) die("revision walk setup failed"); - mark_edges_uninteresting(revs.commits, &revs, show_edge); + mark_edges_uninteresting(&revs, show_edge); traverse_commit_list(&revs, show_commit, show_object, NULL); if (keep_unreachable) |