Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refs: return conflict error when checking packed refs #1716

Closed
wants to merge 1 commit into from
Closed

refs: return conflict error when checking packed refs #1716

wants to merge 1 commit into from

Commits on May 3, 2024

  1. refs: return conflict error when checking packed refs 

    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>
    @ivantsepp
    ivantsepp committed May 3, 2024
    Configuration menu
    Copy the full SHA
    943a862 View commit details
    Browse the repository at this point in the history