Re: [PATCH] refs: return conflict error when checking packed refs
- From
Patrick Steinhardt <ps@pks.im>
- Date
- May 2, 2024, 12:38 UTC
- Message-ID
- <ZjOJONdlaINfN_i_@tanuki>
- In-Reply-To
- <pull.1716.git.git.1714488648294.gitgitgadget@gmail.com>
On Tue, Apr 30, 2024 at 02:50:47PM +0000, Ivan Tse via GitGitGadget wrote:
Show 14 quoted lines
> 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