git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v13 6/6] remote: resolve @{push} through remote.<name>.fetchRefmap

From
D. Ben Knoble <ben.knoble@gmail.com>
Date
Nov 11, 2026, 18:27 UTC
Message-ID
<CALnO6CB+AP=osF8mjkGGHWZz8YX322UoSjE6DCfYZkZ0rXxVcg@mail.gmail.com>
In-Reply-To
<25eec8d9676d4adf82570616ca88a2b38d20afa4.1793357550.git.gitgitgadget@gmail.com>
Hi Harald,

On Fri, Oct 30, 2026 at 6:52 AM Harald Nordgren via GitGitGadget <gitgitgadget@gmail.com> wrote:

Show 7 quoted lines
>
> From: Harald Nordgren <haraldnordgren@gmail.com>
>
> A branch pushed to a remote set up with "git remote add
> --limited-fetch" has no remote.<name>.fetch entry to map it
> through, so @{push} cannot tell where it landed and fails with
> "has no local tracking branch".

I don't have the rest of the series paged in right now (esp. patches 4 & 5 which deal with --limited-fetch), so forgive me if this comes from ignorance.

Wouldn't the same problem happen if we applied the first 3 patches, then setup a repository's remote with a fetchRefmap and limited (or none) default fetch? If so, that almost makes this seem like a bugfix for an earlier patch, and perhaps it belongs together? It also would then be better justified in those terms, I think.

Such a reorganization would maybe let the early part of the series be mostly about fetchRefmap (which I'm keen on) and let the end be about --limited-fetch, which seems nice but I don't have a strong motivation to review right now (personally---it's just limited time to spend!).

Show 21 quoted lines
> Give tracking_for_push_dest() the same fallback to
> remote.<name>.fetchRefmap that get_ref_map() uses on the fetch
> side, so a --limited-fetch remote supports @{push} resolution
> the same way any other remote does.
>
> Signed-off-by: Harald Nordgren <haraldnordgren@gmail.com>
> ---
>  remote.c                  |  2 ++
>  t/t1514-rev-parse-push.sh | 19 +++++++++++++++++++
>  2 files changed, 21 insertions(+)
>
> diff --git a/remote.c b/remote.c
> index 15cd96aa8e..ecd104766c 100644
> --- a/remote.c
> +++ b/remote.c
> @@ -2018,6 +2018,8 @@ static char *tracking_for_push_dest(struct repository *repo,
>
>         remote = repo_remote_for_push_tracking(repo, remote);
>         ret = apply_refspecs(&remote->fetch, refname);
> +       if (!ret)
> +               ret = apply_refspecs(&remote->refmap, refname);

Ok, if we don't find the information in the fetch spec, we fallback to the refmap. That also means the former overrides the latter in case both are configured.

Does that match what a fetch does if both are configured and overlap? (I'm not sure, as I can't recall what we decided the fetching behavior is!)

Show 30 quoted lines
>         if (!ret)
>                 return error_buf(err,
>                                  _("push destination '%s' on remote '%s' has no local tracking branch"),
> diff --git a/t/t1514-rev-parse-push.sh b/t/t1514-rev-parse-push.sh
> index 5a4f16867a..bcf00107f5 100755
> --- a/t/t1514-rev-parse-push.sh
> +++ b/t/t1514-rev-parse-push.sh
> @@ -80,4 +80,23 @@ test_expect_success 'resolving @{push} fails with a detached HEAD' '
>         test_must_fail git rev-parse @{push}
>  '
>
> +test_expect_success '@{push} resolves after pushing to a --limited-fetch remote' '
> +       test_when_finished "rm -fr upstream fork downstream" &&
> +       git init -b main upstream &&
> +       test_commit -C upstream base &&
> +       git init --bare fork &&
> +       git clone --sparse upstream downstream &&
> +       (
> +               cd downstream &&
> +               git remote add --limited-fetch fork ../fork &&
> +               git config push.default current &&
> +               git config remote.pushDefault fork &&
> +               git checkout -b topic main &&
> +               test_commit on-topic &&
> +               git push &&
> +               resolve topic@{push} refs/remotes/fork/topic &&
> +               test_cmp_rev topic topic@{push}
> +       )
> +'
> +

If you take my suggestion to make this change with the early parts of the series, the test would probably need to be in terms of fetchRefmap instead of --limited-fetch, as well. That might be one reason to consider leaving it at the end, but… really the "problem" is the interaction of the earlier feature more than --limited-fetch, right?

HTH,
-- 
D. Ben Knoble
Previous: Harald Nordgren via GitGitGadgetNext: Junio C Hamano
Message 136 of 157 in “fetch: add config to avoid fetching every branch in shallow repo”
  1. fetch: add config to avoid fetching every branch in shallow repoHarald Nordgren via GitGitGadget, Sep 19, 2026
  2. Phillip WoodSep 21, 2026
  3. Harald NordgrenSep 21, 2026
  4. Harald NordgrenSep 22, 2026
  5. Phillip WoodSep 22, 2026
  6. Harald NordgrenSep 22, 2026
  7. Phillip WoodSep 23, 2026
  8. Junio C HamanoSep 22, 2026
  9. Harald NordgrenSep 22, 2026
  10. Phillip WoodSep 23, 2026
  11. Junio C HamanoSep 23, 2026
  12. D. Ben KnobleSep 23, 2026
  13. Junio C HamanoSep 23, 2026
  14. D. Ben KnobleSep 24, 2026
  15. Junio C HamanoSep 24, 2026
  16. fetch: avoid fetching every branch of a new remote in a shallow repoHarald Nordgren via GitGitGadget, Sep 23, 2026
  17. Junio C HamanoSep 23, 2026
  18. 0/4 fetch: avoid fetching every branch of a new remote in a shallow repoHarald Nordgren via GitGitGadget, Sep 25, 2026
  19. 1/4 fetch: add remote.<name>.refmapHarald Nordgren via GitGitGadget, Sep 25, 2026
  20. Junio C HamanoSep 25, 2026
  21. 2/4 fetch: infer branches to fetch from a refmap-only remoteHarald Nordgren via GitGitGadget, Sep 25, 2026
  22. Junio C HamanoSep 25, 2026
  23. 3/4 remote: add "git remote add --limited-fetch"Harald Nordgren via GitGitGadget, Sep 25, 2026
  24. 4/4 remote: default to --limited-fetch in a shallow repositoryHarald Nordgren via GitGitGadget, Sep 25, 2026
  25. 0/4 fetch: avoid fetching every branch of a new remote in a shallow repoHarald Nordgren via GitGitGadget, Sep 29, 2026
  26. 1/4 fetch: add remote.<name>.refmapHarald Nordgren via GitGitGadget, Sep 29, 2026
  27. 2/4 fetch: infer branches to fetch from a refmap-only remoteHarald Nordgren via GitGitGadget, Sep 29, 2026
  28. Harald NordgrenSep 29, 2026
  29. Junio C HamanoSep 29, 2026
  30. 3/4 remote: add "git remote add --limited-fetch"Harald Nordgren via GitGitGadget, Sep 29, 2026
  31. 4/4 remote: default to --limited-fetch in a shallow repositoryHarald Nordgren via GitGitGadget, Sep 29, 2026
  32. Junio C HamanoSep 29, 2026
  33. 0/4 fetch: avoid fetching every branch of a new remote in a shallow repoHarald Nordgren via GitGitGadget, Oct 2, 2026
  34. 1/4 fetch: add remote.<name>.refmapHarald Nordgren via GitGitGadget, Oct 2, 2026
  35. 2/4 fetch: infer branches to fetch from a refmap-only remoteHarald Nordgren via GitGitGadget, Oct 2, 2026
  36. 3/4 remote: add "git remote add --limited-fetch"Harald Nordgren via GitGitGadget, Oct 2, 2026
  37. Junio C HamanoOct 2, 2026
  38. 4/4 remote: default to --limited-fetch in a shallow repositoryHarald Nordgren via GitGitGadget, Oct 2, 2026
  39. 0/4 fetch: avoid fetching every branch of a new remote in a shallow repoHarald Nordgren via GitGitGadget, Oct 4, 2026
  40. 1/4 fetch: add remote.<name>.refmapHarald Nordgren via GitGitGadget, Oct 4, 2026
  41. 2/4 fetch: infer branches to fetch from a refmap-only remoteHarald Nordgren via GitGitGadget, Oct 4, 2026
  42. 3/4 remote: add "git remote add --limited-fetch"Harald Nordgren via GitGitGadget, Oct 4, 2026
  43. 4/4 remote: default to --limited-fetch in a shallow repositoryHarald Nordgren via GitGitGadget, Oct 4, 2026
  44. Junio C HamanoOct 4, 2026
  45. Harald NordgrenOct 4, 2026
  46. Junio C HamanoOct 5, 2026
  47. Harald NordgrenOct 5, 2026
  48. 0/4 fetch: avoid fetching every branch of a new remote in a shallow repoHarald Nordgren via GitGitGadget, Oct 7, 2026
  49. 1/4 fetch: add remote.<name>.refmapHarald Nordgren via GitGitGadget, Oct 7, 2026
  50. 2/4 fetch: infer branches to fetch from a refmap-only remoteHarald Nordgren via GitGitGadget, Oct 7, 2026
  51. Junio C HamanoOct 8, 2026
  52. Harald NordgrenOct 9, 2026
  53. Harald NordgrenOct 9, 2026
  54. 3/4 remote: add "git remote add --limited-fetch"Harald Nordgren via GitGitGadget, Oct 7, 2026
  55. 4/4 remote: default to --limited-fetch in a shallow repositoryHarald Nordgren via GitGitGadget, Oct 7, 2026
  56. 0/5 fetch: avoid fetching every branch of a new remote in a shallow repoHarald Nordgren via GitGitGadget, Oct 10, 2026
  57. 1/5 fetch: add remote.<name>.refmapHarald Nordgren via GitGitGadget, Oct 10, 2026
  58. 2/5 fetch: extract collect_upstream_from_remote() helperHarald Nordgren via GitGitGadget, Oct 10, 2026
  59. Junio C HamanoOct 10, 2026
  60. Harald NordgrenOct 10, 2026
  61. 3/5 fetch: infer branches to fetch from a refmap-only remoteHarald Nordgren via GitGitGadget, Oct 10, 2026
  62. 4/5 remote: add "git remote add --limited-fetch"Harald Nordgren via GitGitGadget, Oct 10, 2026
  63. Junio C HamanoOct 10, 2026
  64. 5/5 remote: default to --limited-fetch in a shallow repositoryHarald Nordgren via GitGitGadget, Oct 10, 2026
  65. 0/5 fetch: avoid fetching every branch of a new remote in a shallow repoHarald Nordgren via GitGitGadget, Oct 14, 2026
  66. 1/5 fetch: add remote.<name>.refmapHarald Nordgren via GitGitGadget, Oct 14, 2026
  67. 2/5 fetch: extract collect_upstream_from_remote() helperHarald Nordgren via GitGitGadget, Oct 14, 2026
  68. 3/5 fetch: infer branches to fetch from a refmap-only remoteHarald Nordgren via GitGitGadget, Oct 14, 2026
  69. 4/5 remote: add "git remote add --limited-fetch"Harald Nordgren via GitGitGadget, Oct 14, 2026
  70. 5/5 remote: default to --limited-fetch in a shallow repositoryHarald Nordgren via GitGitGadget, Oct 14, 2026
  71. 0/5 fetch: avoid fetching every branch of a new remote in a shallow repoHarald Nordgren via GitGitGadget, Oct 20, 2026
  72. 1/5 fetch: add remote.<name>.refmapHarald Nordgren via GitGitGadget, Oct 20, 2026
  73. D. Ben KnobleOct 24, 2026
  74. Harald NordgrenOct 24, 2026
  75. D. Ben KnobleOct 25, 2026
  76. Harald NordgrenOct 25, 2026
  77. Junio C HamanoOct 25, 2026
  78. Harald NordgrenOct 26, 2026
  79. Junio C HamanoOct 26, 2026
  80. Phillip WoodOct 27, 2026
  81. Junio C HamanoOct 27, 2026
  82. Phillip WoodOct 28, 2026
  83. Junio C HamanoOct 28, 2026
  84. Harald NordgrenOct 28, 2026
  85. Phillip WoodOct 29, 2026
  86. Junio C HamanoOct 29, 2026
  87. Phillip WoodOct 26, 2026
  88. Junio C HamanoOct 26, 2026
  89. Phillip WoodOct 26, 2026
  90. Ben KnobleOct 29, 2026
  91. Harald NordgrenOct 29, 2026
  92. Junio C HamanoOct 29, 2026
  93. Harald NordgrenOct 30, 2026
  94. Notes, refs, etc. (was: Re: [PATCH v10 1/5] fetch: add remote.<name>.refmap)D. Ben Knoble, Nov 7, 2026
  95. Kristoffer HaugsbakkNov 20, 2026
  96. 2/5 fetch: extract collect_upstream_from_remote() helperHarald Nordgren via GitGitGadget, Oct 20, 2026
  97. D. Ben KnobleOct 24, 2026
  98. Harald NordgrenOct 25, 2026
  99. D. Ben KnobleOct 27, 2026
  100. 3/5 fetch: infer branches to fetch from a refmap-only remoteHarald Nordgren via GitGitGadget, Oct 20, 2026
  101. D. Ben KnobleOct 24, 2026
  102. Harald NordgrenOct 25, 2026
  103. 4/5 remote: add "git remote add --limited-fetch"Harald Nordgren via GitGitGadget, Oct 20, 2026
  104. D. Ben KnobleOct 24, 2026
  105. 5/5 remote: default to --limited-fetch in a shallow repositoryHarald Nordgren via GitGitGadget, Oct 20, 2026
  106. D. Ben KnobleOct 24, 2026
  107. Harald NordgrenOct 25, 2026
  108. Junio C HamanoOct 23, 2026
  109. D. Ben KnobleOct 24, 2026
  110. Phillip WoodOct 26, 2026
  111. Junio C HamanoOct 26, 2026
  112. Harald NordgrenOct 27, 2026
  113. Phillip WoodOct 27, 2026
  114. 0/5 fetch: avoid fetching every branch of a new remote in a shallow repoHarald Nordgren via GitGitGadget, Oct 25, 2026
  115. 1/5 fetch: add remote.<name>.refmapHarald Nordgren via GitGitGadget, Oct 25, 2026
  116. 2/5 fetch: extract collect_upstream_from_remote() helperHarald Nordgren via GitGitGadget, Oct 25, 2026
  117. 3/5 fetch: infer branches to fetch from a refmap-only remoteHarald Nordgren via GitGitGadget, Oct 25, 2026
  118. 4/5 remote: add "git remote add --limited-fetch"Harald Nordgren via GitGitGadget, Oct 25, 2026
  119. 5/5 remote: default to --limited-fetch in a shallow repositoryHarald Nordgren via GitGitGadget, Oct 25, 2026
  120. 0/5 fetch: avoid fetching every branch of a new remote in a shallow repoHarald Nordgren via GitGitGadget, Oct 27, 2026
  121. 1/5 fetch: add remote.<name>.fetchRefmapHarald Nordgren via GitGitGadget, Oct 27, 2026
  122. 2/5 fetch: extract collect_upstream_from_remote() helperHarald Nordgren via GitGitGadget, Oct 27, 2026
  123. 3/5 fetch: infer branches to fetch from a refmap-only remoteHarald Nordgren via GitGitGadget, Oct 27, 2026
  124. 4/5 remote: add "git remote add --limited-fetch"Harald Nordgren via GitGitGadget, Oct 27, 2026
  125. 5/5 remote: default to --limited-fetch in a shallow repositoryHarald Nordgren via GitGitGadget, Oct 27, 2026
  126. 0/6 fetch: avoid fetching every branch of a new remote in a shallow repoHarald Nordgren via GitGitGadget, Oct 30, 2026
  127. 1/6 fetch: add remote.<name>.fetchRefmapHarald Nordgren via GitGitGadget, Oct 30, 2026
  128. Phillip WoodNov 12, 2026
  129. Junio C HamanoNov 12, 2026
  130. Phillip WoodNov 13, 2026
  131. 2/6 fetch: extract collect_upstream_from_remote() helperHarald Nordgren via GitGitGadget, Oct 30, 2026
  132. 3/6 fetch: infer branches to fetch from a refmap-only remoteHarald Nordgren via GitGitGadget, Oct 30, 2026
  133. 4/6 remote: add "git remote add --limited-fetch"Harald Nordgren via GitGitGadget, Oct 30, 2026
  134. 5/6 remote: default to --limited-fetch in a shallow repositoryHarald Nordgren via GitGitGadget, Oct 30, 2026
  135. 6/6 remote: resolve @{push} through remote.<name>.fetchRefmapHarald Nordgren via GitGitGadget, Oct 30, 2026
  136. D. Ben KnobleNov 11, 2026
  137. Junio C HamanoNov 11, 2026
  138. Harald NordgrenNov 14, 2026
  139. Harald NordgrenNov 11, 2026
  140. Phillip WoodNov 11, 2026
  141. Junio C HamanoNov 11, 2026
  142. D. Ben KnobleNov 11, 2026
  143. Phillip WoodNov 12, 2026
  144. Matt HunterNov 12, 2026
  145. Phillip WoodNov 17, 2026
  146. 0/5 fetch: avoid fetching every branch of a new remote in a shallow repoHarald Nordgren via GitGitGadget, Nov 14, 2026
  147. 1/5 fetch: add remote.<name>.fetchRefmapHarald Nordgren via GitGitGadget, Nov 14, 2026
  148. Phillip WoodNov 17, 2026
  149. Junio C HamanoNov 17, 2026
  150. Phillip WoodNov 17, 2026
  151. Junio C HamanoNov 17, 2026
  152. Phillip WoodNov 19, 2026
  153. Junio C HamanoNov 19, 2026
  154. 2/5 fetch: extract collect_upstream_from_remote() helperHarald Nordgren via GitGitGadget, Nov 14, 2026
  155. 3/5 fetch: infer branches to fetch from a refmap-only remoteHarald Nordgren via GitGitGadget, Nov 14, 2026
  156. 4/5 remote: add "git remote add --limited-fetch"Harald Nordgren via GitGitGadget, Nov 14, 2026
  157. 5/5 remote: default to --limited-fetch in a shallow repositoryHarald Nordgren via GitGitGadget, Nov 14, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.