From: Junio C Hamano <gitster@pobox.com>
To: "Tao Klerks via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Tao Klerks" <tao@klerks.biz>, "Glen Choo" <chooglen@google.com>
Subject: Re: [PATCH v4] tracking branches: add advice to ambiguous refspec error
Date: Tue, 29 Mar 2022 08:49:33 -0700 [thread overview]
Message-ID: <xmqqh77gyd0y.fsf@gitster.g> (raw)
In-Reply-To: <pull.1183.v4.git.1648553209157.gitgitgadget@gmail.com> (Tao Klerks via GitGitGadget's message of "Tue, 29 Mar 2022 11:26:48 +0000")
"Tao Klerks via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: Tao Klerks <tao@klerks.biz>
>
> The error "not tracking: ambiguous information for ref" is raised
> when we are evaluating what tracking information to set on a branch,
> and find that the ref to be added as tracking branch is mapped
> under multiple remotes' fetch refspecs.
>
> This can easily happen when a user copy-pastes a remote definition
> in their git config, and forgets to change the tracking path.
>
> Add advice in this situation, explicitly highlighting which remotes
> are involved and suggesting how to correct the situation.
>
> Signed-off-by: Tao Klerks <tao@klerks.biz>
> ---
> tracking branches: add advice to ambiguous refspec error
>
> I believe this third version incorporates all Ævar's suggestions, and
> might be usable. Removed "RFC" prefix.
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1183%2FTaoK%2Fadvise-ambiguous-tracking-refspec-v4
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1183/TaoK/advise-ambiguous-tracking-refspec-v4
> Pull-Request: https://github.com/gitgitgadget/git/pull/1183
>
> Range-diff vs v3:
>
> 1: 22ffe81ac26 = 1: ac6c782f566 tracking branches: add advice to ambiguous refspec error
>
>
> Documentation/config/advice.txt | 4 +++
> advice.c | 1 +
> advice.h | 1 +
> branch.c | 44 +++++++++++++++++++++++++++++----
> 4 files changed, 45 insertions(+), 5 deletions(-)
Sent a wrong version?
The patch text seems to be identical to that of v3 message archived at
https://lore.kernel.org/git/pull.1183.v3.git.1648450268285.gitgitgadget@gmail.com/
next prev parent reply other threads:[~2022-03-29 15:49 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-21 10:23 [PATCH] tracking branches: add advice to ambiguous refspec error Tao Klerks via GitGitGadget
2022-03-21 14:11 ` Ævar Arnfjörð Bjarmason
2022-03-22 9:09 ` Tao Klerks
2022-03-22 9:18 ` [PATCH v2] RFC: " Tao Klerks via GitGitGadget
2022-03-22 10:04 ` Ævar Arnfjörð Bjarmason
2022-03-28 6:51 ` [PATCH v3] " Tao Klerks via GitGitGadget
2022-03-28 16:23 ` Junio C Hamano
2022-03-28 17:12 ` Glen Choo
2022-03-28 17:23 ` Junio C Hamano
2022-03-28 18:02 ` Tao Klerks
2022-03-28 18:50 ` Ævar Arnfjörð Bjarmason
2022-03-28 20:32 ` Junio C Hamano
2022-03-28 20:27 ` Junio C Hamano
2022-03-29 11:26 ` Tao Klerks
2022-03-29 11:26 ` [PATCH v4] " Tao Klerks via GitGitGadget
2022-03-29 11:31 ` Tao Klerks
2022-03-29 15:49 ` Junio C Hamano [this message]
2022-03-30 4:17 ` Tao Klerks
2022-03-30 7:20 ` [PATCH v5] " Tao Klerks via GitGitGadget
2022-03-30 13:19 ` Ævar Arnfjörð Bjarmason
2022-03-30 14:23 ` Tao Klerks
2022-03-30 15:18 ` Tao Klerks
2022-03-30 17:14 ` Ævar Arnfjörð Bjarmason
2022-03-30 20:37 ` Junio C Hamano
2022-03-30 21:09 ` Ævar Arnfjörð Bjarmason
2022-03-30 22:07 ` Junio C Hamano
2022-03-30 22:51 ` Ævar Arnfjörð Bjarmason
2022-03-31 16:01 ` [PATCH v6] " Tao Klerks via GitGitGadget
2022-03-31 19:32 ` Junio C Hamano
2022-03-31 23:57 ` Glen Choo
2022-04-01 4:30 ` Tao Klerks
2022-04-01 16:41 ` Glen Choo
2022-03-31 19:33 ` Junio C Hamano
2022-04-01 6:05 ` [PATCH v7] " Tao Klerks via GitGitGadget
2022-04-01 16:53 ` Glen Choo
2022-04-01 19:57 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqh77gyd0y.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=chooglen@google.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=tao@klerks.biz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).