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.

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

[bug]: zinit self-update fails with a git error due to conflicting branches #609

Open
1 task done
jonatan-ivanov opened this issue Dec 16, 2023 · 2 comments
Open
1 task done
Assignees
Labels
bug Something isn't working

Comments

@jonatan-ivanov
Copy link

What happened?

zinit self-update failed with a git error (due to conflicting branches).

Steps to reproduce

Run zinit self-update.

Relevant output

❯ zinit self-update
[self-update] fetching latest changes from main branch
error: cannot lock ref 'refs/remotes/origin/ci/speedup-zunit': 'refs/remotes/origin/ci' exists; cannot create 'refs/remotes/origin/ci/speedup-zunit'
error: some local refs could not be updated; try running
 'git remote prune origin' to remove any old, conflicting branches
From https://github.com/zdharma-continuum/zinit
 * branch              main       -> FETCH_HEAD
Already up to date.
[self-update] compiling zinit via zcompile
[self-update] reloading zinit for the current session

Screenshots and recordings

No response

Operating System & Version

OS: darwin22.0 | Vendor: apple | Machine: x86_64 | CPU: x86_64 | Processor: i386 | Hardware: x86_64

Zsh version

zsh 5.9 (x86_64-apple-darwin22.0)

Terminal emulator

xterm-256color // iTerm2

If using WSL on Windows, which version of WSL

None

Additional context

It seems there are conflicting branches, pruning them resolves the issue:

cd "$HOME/.zinit/bin"
git remote prune origin
git pull

Code of Conduct

  • I agree to follow this project's Code of Conduct
@jonatan-ivanov jonatan-ivanov added the bug Something isn't working label Dec 16, 2023
@vladdoster
Copy link
Member

@jonatan-ivanov,

Seems related to #606. Will prioritize a fix for this.

@vladdoster
Copy link
Member

@jonatan-ivanov,

Seems related to #606. Will prioritize a fix for this.

Addendum: #606 is unrelated

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

2 participants