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

(bugfix): zinit self-update uses current branch #173

Merged
merged 3 commits into from
Apr 18, 2022

Conversation

vladdoster
Copy link
Member

fixes bug where zinit self-update was hard-coded to use main, even if it was on a different branch.

Signed-off-by: Vladislav Doster mvdoster@gmail.com

@vladdoster vladdoster force-pushed the bugfix/self-update-can-use-any-branch branch 3 times, most recently from 96081a4 to f0f05d6 Compare February 1, 2022 06:54
@vladdoster
Copy link
Member Author

carbon

@vladdoster
Copy link
Member Author

~ bugfix/self-update-can-use-any-branch
ᐳ zi self-update
[self-update] fetching changes for bugfix/self-update-can-use-any-branch
From https://github.com/zdharma-continuum/zinit
 * branch              bugfix/self-update-can-use-any-branch -> FETCH_HEAD
Already up to date.
[self-update] Compiling Zinit (zcompile)…
[self-update] Reloading Zinit for the current session…

~ bugfix/self-update-can-use-any-branch
ᐳ

@vladdoster vladdoster force-pushed the bugfix/self-update-can-use-any-branch branch 2 times, most recently from a243057 to 6f671a4 Compare February 1, 2022 07:32
@alichtman
Copy link
Member

alichtman commented Feb 3, 2022

Can you regenerate the docs to get the tests to pass?

@alichtman alichtman self-requested a review February 3, 2022 05:22
zinit-autoload.zsh Outdated Show resolved Hide resolved
zinit-install.zsh Outdated Show resolved Hide resolved
@vladdoster vladdoster force-pushed the bugfix/self-update-can-use-any-branch branch from 532197d to d5dc60c Compare April 11, 2022 09:44
@github-actions github-actions bot added the zinit label Apr 11, 2022
@vladdoster
Copy link
Member Author

Screen Shot 2022-04-11 at 04 47 48

@github-actions github-actions bot added the docs label Apr 11, 2022
Fix bug in Zinit `self-update` command that used the `main` branch
instead of using current branch.

Signed-off-by: Vladislav Doster <mvdoster@gmail.com>
@vladdoster vladdoster force-pushed the bugfix/self-update-can-use-any-branch branch from 5f03944 to 23c47e1 Compare April 11, 2022 09:59
Signed-off-by: Vladislav Doster <mvdoster@gmail.com>
Signed-off-by: Vladislav Doster <mvdoster@gmail.com>
@alichtman alichtman merged commit 537e895 into main Apr 18, 2022
@alichtman alichtman deleted the bugfix/self-update-can-use-any-branch branch April 18, 2022 01:19
builtin cd -q "$ZINIT[BIN_DIR]" \
&& +zinit-message -n "{pre}[self-update]{msg2} fetching latest changes from {msg2}$current_branch$nl{cmd}" \
&& command git fetch --quiet \
&& lines=( ${(f)"$(command git log --color --date=short --pretty=format:'%Cgreen%cd %h %Creset%s %Cred%d%Creset || %b' ..FETCH_HEAD)"} )
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line removed --no-pager option, so #177 problem reoccurred. Can this be reverted?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, there is a nother bug where log output should be on a newline. Preparing PR

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still it seems that there is no --no-pager in zinit self-update command. When it will be added?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yous,

Please open a new issue instead of commenting on a two year old PR.

@github-actions
Copy link

github-actions bot commented Nov 7, 2022

🎉 This PR is included in version 3.8.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@zdharma-continuum zdharma-continuum locked and limited conversation to collaborators Jan 21, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants