From: Patrick Steinhardt <ps@pks.im>
To: Ivan Tse via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Ivan Tse <ivan.tse1@gmail.com>
Subject: Re: [PATCH] refs: return conflict error when checking packed refs
Date: Thu, 2 May 2024 14:38:16 +0200 [thread overview]
Message-ID: <ZjOJONdlaINfN_i_@tanuki> (raw)
In-Reply-To: <pull.1716.git.git.1714488648294.gitgitgadget@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 948 bytes --]
On Tue, Apr 30, 2024 at 02:50:47PM +0000, Ivan Tse via GitGitGadget wrote:
> From: Ivan Tse <ivan.tse1@gmail.com>
>
> The TRANSACTION_NAME_CONFLICT error code refers to a failure to create a
> ref due to a name conflict with another ref. An example of this is a
> directory/file conflict such as ref names A/B and A.
>
> "git fetch" uses this error code to more accurately describe the error
> by recommending to the user that they try running "git remote prune" to
> remove any old refs that are deleted by the remote which would clear up
> any directory/file conflicts.
>
> This helpful error message is not displayed when the conflicted ref is
> stored in packed refs. This change fixes this by ensuring error return
> code consistency in `lock_raw_ref`.
The change itself makes sense to me. But I'd like to see a test that
demonstrates the new behaviour so that we don't regress this in the
future.
Thanks!
Patrick
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2024-05-02 12:38 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-30 14:50 [PATCH] refs: return conflict error when checking packed refs Ivan Tse via GitGitGadget
2024-05-02 12:38 ` Patrick Steinhardt [this message]
2024-05-03 4:50 ` [PATCH v2] " Ivan Tse via GitGitGadget
2024-05-03 6:38 ` Patrick Steinhardt
2024-05-04 3:04 ` [PATCH v3] " Ivan Tse via GitGitGadget
2024-05-06 6:47 ` Patrick Steinhardt
2024-05-06 11:40 ` Karthik Nayak
2024-05-06 19:01 ` Junio C Hamano
2024-05-07 5:51 ` Ivan Tse
2024-05-07 13:37 ` Karthik Nayak
2024-05-08 1:39 ` Ivan Tse
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=ZjOJONdlaINfN_i_@tanuki \
--to=ps@pks.im \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=ivan.tse1@gmail.com \
/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).