diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-10-23 13:32:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-23 13:32:17 -0700 |
| commit | 6ba0d9551a2963a6fed83b90b55a373d79ef46d0 (patch) | |
| tree | 528a196ba43fa7a9d519e2a2a2864a64ebd25091 /list-objects.h | |
| parent | git-merge: document the -S option (diff) | |
| parent | Add testcase for needless objects during a shallow fetch (diff) | |
| download | tgif-6ba0d9551a2963a6fed83b90b55a373d79ef46d0.tar.xz | |
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 'list-objects.h')
| -rw-r--r-- | list-objects.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/list-objects.h b/list-objects.h index 3db7bb6fa3..136a1da5a6 100644 --- a/list-objects.h +++ b/list-objects.h @@ -6,6 +6,6 @@ typedef void (*show_object_fn)(struct object *, const struct name_path *, const void traverse_commit_list(struct rev_info *, show_commit_fn, show_object_fn, void *); typedef void (*show_edge_fn)(struct commit *); -void mark_edges_uninteresting(struct commit_list *, struct rev_info *, show_edge_fn); +void mark_edges_uninteresting(struct rev_info *, show_edge_fn); #endif |