summaryrefslogtreecommitdiff
path: root/transport.h
diff options
context:
space:
mode:
authorJonathan Tan <jonathantanmy@google.com>2018-07-02 22:39:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-03 22:00:41 (GMT)
commit3390e42adb3b84a9d61b3d46f4105f4cb6ba5edd (patch)
tree6d3b797117769e6c5a60d9fcd0b30bc7479d20f1 /transport.h
parentec06283844a90c3e9440286401e9ad7d86daa5ae (diff)
downloadgit-3390e42adb3b84a9d61b3d46f4105f4cb6ba5edd.zip
git-3390e42adb3b84a9d61b3d46f4105f4cb6ba5edd.tar.gz
git-3390e42adb3b84a9d61b3d46f4105f4cb6ba5edd.tar.bz2
fetch-pack: support negotiation tip whitelist
During negotiation, fetch-pack eventually reports as "have" lines all commits reachable from all refs. Allow the user to restrict the commits sent in this way by providing a whitelist of tips; only the tips themselves and their ancestors will be sent. Both globs and single objects are supported. This feature is only supported for protocols that support connect or stateless-connect (such as HTTP with protocol v2). This will speed up negotiation when the repository has multiple relatively independent branches (for example, when a repository interacts with multiple repositories, such as with linux-next [1] and torvalds/linux [2]), and the user knows which local branch is likely to have commits in common with the upstream branch they are fetching. [1] https://kernel.googlesource.com/pub/scm/linux/kernel/git/next/linux-next/ [2] https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux/ Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'transport.h')
-rw-r--r--transport.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/transport.h b/transport.h
index 7792b08..d31be5b 100644
--- a/transport.h
+++ b/transport.h
@@ -25,6 +25,16 @@ struct git_transport_options {
const char *receivepack;
struct push_cas_option *cas;
struct list_objects_filter_options filter_options;
+
+ /*
+ * This is only used during fetch. See the documentation of
+ * negotiation_tips in struct fetch_pack_args.
+ *
+ * This field is only supported by transports that support connect or
+ * stateless_connect. Set this field directly instead of using
+ * transport_set_option().
+ */
+ struct oid_array *negotiation_tips;
};
enum transport_family {