From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oo1-f52.google.com (mail-oo1-f52.google.com [209.85.161.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2FDB23E49C0 for ; Wed, 7 Oct 2026 21:56:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791410174; cv=none; b=TbWBGIccFXpt/CS1nHiTLX6RGNbKwddLo+/zWfDMPEFrf7Vn0J/b/gmoSxnW7UfOUM+OKNo1Px6YjgHI4sOc2z+RcQPx6p6RwGEmHMbrdxhjh/GaS1CjEM/6CpfS2AeXlyIMePuHxbtWeM2a0/cYI4wq+EaTQDFbrpVlhxdi3jg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791410174; c=relaxed/simple; bh=f2Gqk98cFh5lmneLb6fyFwisqzTAiBDNrhsi9HhpkSY=; h=Message-Id:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=tefQzAcoIl57sh/bUCe8GIJbm5g6D8ezWnX3yKsKepmkKIPt6tyP7QdP5qPe2fBBeR3LjE5AKi2iTUEVLrGIPukuy6/83UlB4A191S0Su66m+hSMOrHqSVidwNOG6RKPPJl1IP2moUOm71nX3LQ/4SZAwR8CU3GpDslEbHOJ/ZE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ToK10yPI; arc=none smtp.client-ip=209.85.161.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ToK10yPI" Received: by mail-oo1-f52.google.com with SMTP id 006d021491bc7-6dddc514bcdso2660973eaf.3 for ; Wed, 07 Oct 2026 14:56:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791410171; x=1792014971; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:content-type:fcc :subject:date:from:references:in-reply-to:message-id:from:to:cc :subject:date:message-id:reply-to:content-type; bh=EOxo64XDJQp8Ss6djEBZMf5nfcsrsehxscB9oMkS5ME=; b=ToK10yPIPzjNYnSM3Nn8Lbdy5gcoZEA9CiNlq+gLCiKYCxUvMrReaBdXP1SH3Jqrhr M9/8YdGKzEFuz08YM5QgnF6ZQXgxBmT5ayKzK0rYn/M029irieNvmX7K0askLjHUGjxO 0G38fhFXQafRK15nf2XaC/r8yIdcGiIh2mmifZnS2G4eSi7swndaTD4e3JPk9nCVi9da fwUtxQzHoFoGKNxOE+sKdYlLD1DbvuPu38WDQEhLvXwfYmkl+RBb7zgKscTw+X8w53x9 yrNdQ21befmI1RaoOrh1kZsA83HIlIJ4xLBB/ZT0sjyDihpLjR4GaqvVdUfJEzlgS3HV MlGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791410171; x=1792014971; h=cc:to:mime-version:content-transfer-encoding:content-type:fcc :subject:date:from:references:in-reply-to:message-id:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=EOxo64XDJQp8Ss6djEBZMf5nfcsrsehxscB9oMkS5ME=; b=hCDyoS9C3MJoWz8O28QrHs+UUxw34OrdkYtGea3K3a4BdsSw/+hZErwYmKdkHbailJ 3cafs1gEsRXOfylwx53WHmuIYg8p7+i89dXRcqqSzsEIfnrU6FCO40n+uBsfHZuFvIdn jzp0JQIuodFfO4dGLEeLYemC8IYWsvxBimH5AM2D63X11yiVvi7wlY7ejy/GiWReKXdr iLs8z8hbF0/ryBtujFiIwj6cHPOL/YD0syfSTpoA8n1tEK8+kXPD3coEMEwCdFxmETBK EX1gorElAXs9yjFLuvWlnHeaY1uVlGXlmzkmrqN7DU7XPmoTmpcgsTKT68u1AvkRz0JX Glpg== X-Gm-Message-State: AFuF++lan59kPpg6qAo/jSkwHxfbFglbFzbSi+vRhKvigF0Kr3fq6nm+ +TL87uB6jsH2I0cmAaTxBkS/ww9BsWCdeADSmxnPR5424Nvm84MsvrBOr9rKuYwa X-Gm-Gg: AYBFou0IbyOfifYCdfshCT5s2XWDf+a28V9AD2IieoAEuq21kO52yw4UiSFlHbyW5J9 ihDbvaFXWjTHfUPVqMRVg2YzHzGQ7bM7NIQRQCxMdUgMUurF+F/hxwxCv0kn9rVnAY7APEQkJ9F MJmtBCn0QmXt1YIwQ1ro6Bp16PtocJjEfzNhmJegpIW5FqHAezzOgKg5ml/jR3KmAYvBAygZ6xH 3l1nNA14j3i2Om5lMmpoD24x4FvLmyT1sEkH0bPnxKQyanFUSGVePPzP7gRNEsO5gn0sLIwloPH BqO7+cpoVG3o36wJGJM9SLNrSr05QTwkdCHmsNy/cWyGDtXMzG+rzksfYcLvtnfFUVv7rl9Y4AT 95YgtMXo0pmIYFsizAjnqV02SwEVQJ1tW7rZwEAs+ticW/xCuOqLlkFjBW4SXLsMqXeJv9eXcUv eUN7ztZu0KZpB1Yr8FO47ATgaw6gOdOP4nlPaHrku61ok+WRQD9olEOUurAJIUj+x18vmlLnj7j b87bXTdyMLt1nU= X-Received: by 2002:a05:6820:200c:b0:6cd:3fbd:1d66 with SMTP id 006d021491bc7-6e7a718311dmr3639545eaf.80.1791410171130; Wed, 07 Oct 2026 14:56:11 -0700 (PDT) Received: from [127.0.0.1] ([172.215.147.134]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-4a27481df47sm1321152fac.1.2026.10.07.14.56.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Oct 2026 14:56:09 -0700 (PDT) Message-Id: In-Reply-To: References: From: "Harald Nordgren via GitGitGadget" Date: Wed, 07 Oct 2026 21:56:02 +0000 Subject: [PATCH v7 2/4] fetch: infer branches to fetch from a refmap-only remote Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Phillip Wood , "D. Ben Knoble" , Harald Nordgren , Harald Nordgren From: Harald Nordgren Configuring remote..refmap without remote..fetch used to make a refspec-less "git fetch " fail with "--refmap option is only meaningful with command-line refspec(s)", since a refmap only says where to put fetched refs, not what to fetch. Make that case infer what to fetch: the local branches whose @{upstream} is already on that remote. This lets a remote be configured to fetch only the branches actually in use, without listing them by hand in remote..fetch, and without needing to touch the command line every time. Signed-off-by: Harald Nordgren --- Documentation/config/remote.adoc | 5 +- Documentation/fetch-options.adoc | 6 +- builtin/fetch.c | 52 ++++++++++++-- remote.c | 29 ++++++++ remote.h | 3 + t/meson.build | 1 + t/t5586-fetch-refmap.sh | 119 +++++++++++++++++++++++++++++++ 7 files changed, 205 insertions(+), 10 deletions(-) create mode 100755 t/t5586-fetch-refmap.sh diff --git a/Documentation/config/remote.adoc b/Documentation/config/remote.adoc index 103eada406..7c52e443a5 100644 --- a/Documentation/config/remote.adoc +++ b/Documentation/config/remote.adoc @@ -36,7 +36,10 @@ remote..fetch:: remote..refmap:: The default value of the `--refmap` option for linkgit:git-fetch[1]. Used to map remote refs being fetched to remote-tracking refs to - store. See the `--refmap` entry in linkgit:git-fetch[1]. + store. If `remote..fetch` is not set either, a refspec-less + fetch infers what to fetch from local branches built on this + remote, instead of fetching every branch it has. See the + `--refmap` entry in linkgit:git-fetch[1]. remote..push:: The default set of "refspec" for linkgit:git-push[1]. See diff --git a/Documentation/fetch-options.adoc b/Documentation/fetch-options.adoc index c2101a7b39..75899d91cc 100644 --- a/Documentation/fetch-options.adoc +++ b/Documentation/fetch-options.adoc @@ -245,8 +245,10 @@ endif::git-pull[] command-line arguments. See section on "Configured Remote-tracking Branches" for details. + -`remote..refmap` provides the default value for this option, the -same way `remote..fetch` provides the default refspecs to fetch. +When a refmap is active (from `--refmap` or `remote..refmap`) but +there is nothing to fetch, neither on the command line nor from +`remote..fetch`, Git infers what to fetch from the local branches +whose `@{upstream}` is on that remote. `-t`:: `--tags`:: diff --git a/builtin/fetch.c b/builtin/fetch.c index b0ad8c0b5f..e8c481ed3f 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -511,6 +511,8 @@ static struct ref *get_ref_map(struct remote *remote, struct ref **tail = &ref_map; struct refspec *effective_refmap = refmap.nr ? &refmap : remote ? &remote->refmap : NULL; + struct refspec inferred_rs; + int inferred_branches = 0; /* opportunistically-updated references: */ struct ref *orefs = NULL, **oref_tail = &orefs; @@ -518,15 +520,32 @@ static struct ref *get_ref_map(struct remote *remote, struct hashmap existing_refs; int existing_refs_populated = 0; + refspec_init_fetch(&inferred_rs, the_hash_algo); + filter_prefetch_refspec(rs); if (remote) filter_prefetch_refspec(&remote->fetch); + if (!rs->nr && remote && !remote->fetch.nr && + effective_refmap && effective_refmap->nr) { + struct string_list tracked = STRING_LIST_INIT_DUP; + struct string_list_item *item; + + branches_tracking_remote(remote, &tracked); + for_each_string_list_item(item, &tracked) + refspec_append(&inferred_rs, item->string); + string_list_clear(&tracked, 0); + + rs = &inferred_rs; + inferred_branches = 1; + } + if (rs->nr) { struct refspec *fetch_refspec; for (i = 0; i < rs->nr; i++) { - get_fetch_map(remote_refs, &rs->items[i], &tail, 0); + get_fetch_map(remote_refs, &rs->items[i], &tail, + inferred_branches); if (rs->items[i].dst && rs->items[i].dst[0]) *autotags = 1; } @@ -561,6 +580,8 @@ static struct ref *get_ref_map(struct remote *remote, for (i = 0; i < fetch_refspec->nr; i++) get_fetch_map(ref_map, &fetch_refspec->items[i], &oref_tail, 1); + } else if (inferred_branches) { + /* Already fully handled above. */ } else if (refmap.nr) { die("--refmap option is only meaningful with command-line refspec(s)"); } else { @@ -656,6 +677,7 @@ static struct ref *get_ref_map(struct remote *remote, if (existing_refs_populated) hashmap_clear_and_free(&existing_refs, struct refname_hash_entry, ent); + refspec_clear(&inferred_rs); return ref_map; } @@ -1960,15 +1982,30 @@ static int do_fetch(struct transport *transport, refspec_ref_prefixes(rs, &transport_ls_refs_options.ref_prefixes); } else { struct branch *branch = branch_get(NULL); - - if (transport->remote->fetch.nr) { + int tracks_this_remote = branch && branch_has_merge_config(branch) && + !strcmp(branch->remote_name, transport->remote->name); + struct refspec *effective_refmap = refmap.nr ? &refmap : + &transport->remote->refmap; + int inferred_branches = !transport->remote->fetch.nr && + effective_refmap->nr; + + if (inferred_branches) { + struct string_list tracked = STRING_LIST_INIT_DUP; + struct string_list_item *item; + + branches_tracking_remote(transport->remote, &tracked); + for_each_string_list_item(item, &tracked) + strvec_push(&transport_ls_refs_options.ref_prefixes, + item->string); + string_list_clear(&tracked, 0); + } else if (transport->remote->fetch.nr) { refspec_ref_prefixes(&transport->remote->fetch, &transport_ls_refs_options.ref_prefixes); - if (follow_remote_head != FOLLOW_REMOTE_NEVER) - do_set_head = 1; } - if (branch && branch_has_merge_config(branch) && - !strcmp(branch->remote_name, transport->remote->name)) { + if ((transport->remote->fetch.nr || inferred_branches) && + follow_remote_head != FOLLOW_REMOTE_NEVER) + do_set_head = 1; + if (tracks_this_remote) { int i; for (i = 0; i < branch->merge_nr; i++) { strvec_push(&transport_ls_refs_options.ref_prefixes, @@ -2009,6 +2046,7 @@ static int do_fetch(struct transport *transport, ref_map = get_ref_map(transport->remote, remote_refs, rs, tags, &autotags); + if (!update_head_ok) check_not_current_branch(ref_map); diff --git a/remote.c b/remote.c index 99a086ea5a..c26312beea 100644 --- a/remote.c +++ b/remote.c @@ -1884,6 +1884,35 @@ int branch_merge_matches(struct branch *branch, return refname_match(branch->merge[i]->src, refname); } +struct branches_tracking_remote_cb_data { + struct remote *remote; + struct string_list *tracked; +}; + +static int add_if_tracking_remote(const struct reference *ref, void *cb_data) +{ + struct branches_tracking_remote_cb_data *data = cb_data; + struct branch *branch; + + branch = branch_get(ref->name); + if (!branch_has_merge_config(branch) || + strcmp(branch->remote_name, data->remote->name)) + return 0; + + for (int i = 0; i < branch->merge_nr; i++) + string_list_insert(data->tracked, branch->merge[i]->src); + + return 0; +} + +void branches_tracking_remote(struct remote *remote, struct string_list *tracked) +{ + struct branches_tracking_remote_cb_data data = { remote, tracked }; + + refs_for_each_branch_ref(get_main_ref_store(the_repository), + add_if_tracking_remote, &data); +} + __attribute__((format (printf,2,3))) static char *error_buf(struct strbuf *err, const char *fmt, ...) { diff --git a/remote.h b/remote.h index ac485a584d..da6c3ef53a 100644 --- a/remote.h +++ b/remote.h @@ -359,6 +359,9 @@ int branch_has_merge_config(struct branch *branch); int branch_merge_matches(struct branch *, int n, const char *); +/* fills tracked with the refname of every local branch's upstream on remote */ +void branches_tracking_remote(struct remote *remote, struct string_list *tracked); + /* list of the remote in a group as configured */ struct remote_group_data { const char *name; diff --git a/t/meson.build b/t/meson.build index f65eb04684..e287a6b947 100644 --- a/t/meson.build +++ b/t/meson.build @@ -730,6 +730,7 @@ integration_tests = [ 't5582-fetch-negative-refspec.sh', 't5583-push-branches.sh', 't5584-http-429-retry.sh', + 't5586-fetch-refmap.sh', 't5600-clone-fail-cleanup.sh', 't5601-clone.sh', 't5602-clone-remote-exec.sh', diff --git a/t/t5586-fetch-refmap.sh b/t/t5586-fetch-refmap.sh new file mode 100755 index 0000000000..b81fc48cbe --- /dev/null +++ b/t/t5586-fetch-refmap.sh @@ -0,0 +1,119 @@ +#!/bin/sh + +test_description='"git fetch" with a remote..refmap but no remote..fetch + +When a remote has a refmap configured but no fetch refspec, a +refspec-less fetch infers what to fetch from the local branches whose +@{upstream} is on that remote. +' + +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main +export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME + +. ./test-lib.sh + +test_expect_success 'setup' ' + test_commit main-1 && + test_commit main-2 && + git checkout -b side main-1 && + test_commit side-1 && + git checkout -b next main-1 && + test_commit next-1 && + git checkout main +' + +test_expect_success 'clone shallow and single-branch, then add a second remote' ' + git clone --no-local --depth=1 --branch main --single-branch . client && + ( + cd client && + git remote add upstream .. && + test_might_fail git config unset remote.upstream.fetch && + git config remote.upstream.refmap \ + "+refs/heads/*:refs/remotes/upstream/*" + ) +' + +test_expect_success 'a bare fetch needs nothing until a branch is tracked' ' + ( + cd client && + git fetch upstream && + git for-each-ref --format="%(refname)" refs/remotes/upstream >actual && + test_must_be_empty actual + ) +' + +test_expect_success 'an explicit one-time fetch lets a branch be tracked' ' + ( + cd client && + git fetch upstream main && + git branch --set-upstream-to=upstream/main && + test_cmp_config upstream branch.main.remote && + test_cmp_config refs/heads/main branch.main.merge + ) +' + +test_expect_success 'a branch checked out from a one-time fetch is kept updated by later plain fetches' ' + ( + cd client && + git fetch upstream side:refs/remotes/upstream/side && + git branch side-topic upstream/side + ) && + git checkout side && + test_commit side-2 && + git checkout main && + ( + cd client && + git fetch upstream && + git for-each-ref --format="%(refname)" refs/remotes/upstream >actual && + cat >expect <<-\EOF && + refs/remotes/upstream/HEAD + refs/remotes/upstream/main + refs/remotes/upstream/side + EOF + test_cmp expect actual && + git rev-parse refs/remotes/upstream/side >actual-oid && + git -C .. rev-parse side >expect-oid && + test_cmp expect-oid actual-oid + ) +' + +test_expect_success 'a second branch tracking the same upstream branch does not fetch it twice' ' + ( + cd client && + git branch side-topic-2 upstream/side && + git fetch upstream && + git for-each-ref --format="%(refname)" refs/remotes/upstream >actual && + cat >expect <<-\EOF && + refs/remotes/upstream/HEAD + refs/remotes/upstream/main + refs/remotes/upstream/side + EOF + test_cmp expect actual + ) +' + +test_expect_success 'a branch tracking a different remote is not fetched from upstream' ' + ( + cd client && + git remote add other .. && + git fetch other next:refs/remotes/other/next && + git branch next-topic other/next && + git fetch upstream && + git for-each-ref --format="%(refname)" refs/remotes/upstream >actual && + cat >expect <<-\EOF && + refs/remotes/upstream/HEAD + refs/remotes/upstream/main + refs/remotes/upstream/side + EOF + test_cmp expect actual + ) +' + +test_expect_success 'git remote show does not choke on a refmap-only remote' ' + ( + cd client && + git remote show upstream + ) +' + +test_done -- gitgitgadget