Skip to content

pr-git-2358/HaraldNordgren/remote-resolve-url-push-tracking-v3

tagged this 21 Jul 20:14
Fix git status not showing the push branch after remotes are renamed, when
branch.<name>.pushRemote is a URL matching exactly one configured remote.

Changes in v4:

 * Match against the actual push URL, including pushurl and pushInsteadOf.
 * Clarify how rearranging remotes exposes the git status tracking problem.
 * Simplify and correct the documentation for URL-valued pushRemote.

Changes in v3:

 * Revamp commit messages to clarify motivation.

Changes in v2:

 * Clarify that URL push destinations already work and that this change only
   restores their tracking information.
 * Document URL values for branch.<name>.pushRemote and their @{push}
   behavior.

Harald Nordgren (2):
  remote: pass repository to push tracking helper
  remote: find tracking branches for URL push destinations

 Documentation/config/branch.adoc |   1 +
 Documentation/revisions.adoc     |   3 +
 remote.c                         |  43 +++++++++--
 remote.h                         |   2 +
 t/t5505-remote.sh                | 124 +++++++++++++++++++++++++++++++
 transport.c                      |   5 +-
 6 files changed, 172 insertions(+), 6 deletions(-)

base-commit: 48bbf81c29ca9a4479ec7850fe206518682cdb2f

Submitted-As: https://lore.kernel.org/git/pull.2358.v3.git.git.1784664859.gitgitgadget@gmail.com
In-Reply-To: https://lore.kernel.org/git/pull.2358.git.git.1784538618.gitgitgadget@gmail.com
In-Reply-To: https://lore.kernel.org/git/pull.2358.v2.git.git.1784624306.gitgitgadget@gmail.com
Assets 2
Loading