From: Patrick Steinhardt <ps@pks.im>
Date: Mon, 06 May 2024 06:47:54 GMT
Subject: Re: [PATCH v3] refs: return conflict error when checking packed refs
Message-ID: <Zjh9GlzhJRcS1ZGG@tanuki>
In-Reply-To: <pull.1716.v3.git.git.1714791848557.gitgitgadget@gmail.com>

On Sat, May 04, 2024 at 03:04:08AM +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`.
> 
> Signed-off-by: Ivan Tse <ivan.tse1@gmail.com>

This version looks good to me, thanks!

Patrick