summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-10-19 04:34:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-19 04:34:08 (GMT)
commit465e73fff380808f0ba3fb17984ab8636afb6405 (patch)
treef81f0ceaf8764e2895b82935f08adf9668905d65 /builtin
parent0527fbab689929de47ab3fa7baf1e7618ffa704f (diff)
parent40f327faf543ccaeb03aa0362f3fed7438c2c615 (diff)
downloadgit-465e73fff380808f0ba3fb17984ab8636afb6405.zip
git-465e73fff380808f0ba3fb17984ab8636afb6405.tar.gz
git-465e73fff380808f0ba3fb17984ab8636afb6405.tar.bz2
Merge branch 'tb/filter-alternate-refs'
When pushing into a repository that borrows its objects from an alternate object store, "git receive-pack" that responds to the push request on the other side lists the tips of refs in the alternate to reduce the amount of objects transferred. This sometimes is detrimental when the number of refs in the alternate is absurdly large, in which case the bandwidth saved in potentially fewer objects transferred is wasted in excessively large ref advertisement. The alternate refs that are advertised are now configurable with a pair of configuration variables. * tb/filter-alternate-refs: transport.c: introduce core.alternateRefsPrefixes transport.c: introduce core.alternateRefsCommand transport.c: extract 'fill_alternate_refs_command' transport: drop refnames from for_each_alternate_ref
Diffstat (limited to 'builtin')
-rw-r--r--builtin/receive-pack.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 95740f4..7f089be 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -281,8 +281,7 @@ static int show_ref_cb(const char *path_full, const struct object_id *oid,
return 0;
}
-static void show_one_alternate_ref(const char *refname,
- const struct object_id *oid,
+static void show_one_alternate_ref(const struct object_id *oid,
void *data)
{
struct oidset *seen = data;