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

Cannot update oh-my-zsh on start #211

Closed
krzysztof-jelski opened this Issue Nov 25, 2014 · 9 comments

Comments

Projects
None yet
8 participants
@krzysztof-jelski

krzysztof-jelski commented Nov 25, 2014

When starting babun I get the following:

Executing daily babun check:
Prompt speed      [OK]
Connection check  [OK]
Update check      [OK]
[Oh My Zsh] Would you like to check for updates?
Type Y to update oh-my-zsh: Y
Upgrading Oh My Zsh
Cannot pull with rebase: You have unstaged changes.
Please commit or stash them.
There was an error updating. Try again later?

Of course I enter the 'Y' myself.

@jvtrigueros

This comment has been minimized.

Show comment
Hide comment
@jvtrigueros

jvtrigueros Nov 26, 2014

So I had the same error, this is what I did to fix it

cd .oh-my-zsh
git stash
upgrade_oh_my_zsh

My assumption is that something went bad during the git pull --rebase. Once the update has been completed successfully, then you can simply drop the stash: git stash drop

jvtrigueros commented Nov 26, 2014

So I had the same error, this is what I did to fix it

cd .oh-my-zsh
git stash
upgrade_oh_my_zsh

My assumption is that something went bad during the git pull --rebase. Once the update has been completed successfully, then you can simply drop the stash: git stash drop

@tombujok

This comment has been minimized.

Show comment
Hide comment
@tombujok

tombujok Feb 17, 2015

Contributor

We need to deal with the windows line endings using dos2unix
git diff gives the following output:

a git diff daje: warning: LF will be replaced by CRLF in custom/example.zsh.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in lib/aliases.zsh.
(...)

Contributor

tombujok commented Feb 17, 2015

We need to deal with the windows line endings using dos2unix
git diff gives the following output:

a git diff daje: warning: LF will be replaced by CRLF in custom/example.zsh.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in lib/aliases.zsh.
(...)

@tombujok tombujok closed this in 275ede9 Mar 19, 2015

@tombujok

This comment has been minimized.

Show comment
Hide comment
@tombujok

tombujok Mar 31, 2015

Contributor

Fixed in 1.1.0.
Release status: #266

Contributor

tombujok commented Mar 31, 2015

Fixed in 1.1.0.
Release status: #266

@gliptak

This comment has been minimized.

Show comment
Hide comment
@gliptak

gliptak Jul 20, 2015

I'm seeing this with:

Executing daily babun check:
Source consistent [OK]
Prompt speed [OK]
File permissions [OK]
Connection check [OK]
Update check [OK]
Cygwin check [OK]
[Oh My Zsh] Would you like to check for updates? [Y/n]: y
Upgrading Oh My Zsh
Cannot pull with rebase: You have unstaged changes.
Please commit or stash them.
There was an error updating. Try again later?
{ system32 } » Upgrading Oh My Zsh /cygdrive/c/Windows/system32
{ system32 } » babun --version /cygdrive/c/Windows/system32 1
babun version 1.2.0
Created and maintained by Tom Bujok (@tombujok)
Copyright (c) 2014-2015.

gliptak commented Jul 20, 2015

I'm seeing this with:

Executing daily babun check:
Source consistent [OK]
Prompt speed [OK]
File permissions [OK]
Connection check [OK]
Update check [OK]
Cygwin check [OK]
[Oh My Zsh] Would you like to check for updates? [Y/n]: y
Upgrading Oh My Zsh
Cannot pull with rebase: You have unstaged changes.
Please commit or stash them.
There was an error updating. Try again later?
{ system32 } » Upgrading Oh My Zsh /cygdrive/c/Windows/system32
{ system32 } » babun --version /cygdrive/c/Windows/system32 1
babun version 1.2.0
Created and maintained by Tom Bujok (@tombujok)
Copyright (c) 2014-2015.

@gliptak

This comment has been minimized.

Show comment
Hide comment
@gliptak

gliptak Jul 20, 2015

#211 (comment) didn't work.

{ .oh-my-zsh } master » git status                                                   ~/.oh-my-zsh
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   lib/spectrum.zsh
        modified:   plugins/catimg/catimg.sh
        modified:   plugins/cloudapp/cloudapp.plugin.zsh
        modified:   plugins/coffee/coffee.plugin.zsh
        modified:   plugins/git-flow-avh/git-flow-avh.plugin.zsh
        modified:   plugins/git-flow/git-flow.plugin.zsh
        modified:   plugins/git-hubflow/git-hubflow.plugin.zsh
        modified:   plugins/git-prompt/gitstatus.py
        modified:   plugins/gradle/gradle.plugin.zsh
        modified:   plugins/history-substring-search/history-substring-search.zsh
        modified:   plugins/laravel/laravel.plugin.zsh
        modified:   plugins/last-working-dir/last-working-dir.plugin.zsh
        modified:   plugins/per-directory-history/per-directory-history.zsh
        modified:   plugins/pj/pj.plugin.zsh
        modified:   plugins/wd/wd.plugin.zsh
        modified:   themes/adben.zsh-theme
        modified:   themes/muse.zsh-theme
        modified:   themes/nicoulaj.zsh-theme
        modified:   themes/pure.zsh-theme
        modified:   themes/sonicradish.zsh-theme
        modified:   tools/check_for_upgrade.sh
        modified:   tools/install.sh
        modified:   tools/require_tool.sh

no changes added to commit (use "git add" and/or "git commit -a")

gliptak commented Jul 20, 2015

#211 (comment) didn't work.

{ .oh-my-zsh } master » git status                                                   ~/.oh-my-zsh
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   lib/spectrum.zsh
        modified:   plugins/catimg/catimg.sh
        modified:   plugins/cloudapp/cloudapp.plugin.zsh
        modified:   plugins/coffee/coffee.plugin.zsh
        modified:   plugins/git-flow-avh/git-flow-avh.plugin.zsh
        modified:   plugins/git-flow/git-flow.plugin.zsh
        modified:   plugins/git-hubflow/git-hubflow.plugin.zsh
        modified:   plugins/git-prompt/gitstatus.py
        modified:   plugins/gradle/gradle.plugin.zsh
        modified:   plugins/history-substring-search/history-substring-search.zsh
        modified:   plugins/laravel/laravel.plugin.zsh
        modified:   plugins/last-working-dir/last-working-dir.plugin.zsh
        modified:   plugins/per-directory-history/per-directory-history.zsh
        modified:   plugins/pj/pj.plugin.zsh
        modified:   plugins/wd/wd.plugin.zsh
        modified:   themes/adben.zsh-theme
        modified:   themes/muse.zsh-theme
        modified:   themes/nicoulaj.zsh-theme
        modified:   themes/pure.zsh-theme
        modified:   themes/sonicradish.zsh-theme
        modified:   tools/check_for_upgrade.sh
        modified:   tools/install.sh
        modified:   tools/require_tool.sh

no changes added to commit (use "git add" and/or "git commit -a")
@saadfarooq

This comment has been minimized.

Show comment
Hide comment
@saadfarooq

saadfarooq Apr 22, 2016

For me it's a mode change. Not sure why it's happening. All the files say:

old mode 100644
new mode 100755

saadfarooq commented Apr 22, 2016

For me it's a mode change. Not sure why it's happening. All the files say:

old mode 100644
new mode 100755

@floydpink

This comment has been minimized.

Show comment
Hide comment
@floydpink

floydpink Jun 5, 2016

This is what finally helped resolve the filemode issue:

cd ~/.oh-my-zsh
git config core.filemode false

Source: robbyrussell/oh-my-zsh#1984 (comment)

floydpink commented Jun 5, 2016

This is what finally helped resolve the filemode issue:

cd ~/.oh-my-zsh
git config core.filemode false

Source: robbyrussell/oh-my-zsh#1984 (comment)

@AnthonyWC

This comment has been minimized.

Show comment
Hide comment
@AnthonyWC

AnthonyWC Jul 4, 2016

I solved it using:

git rebase --skip

AnthonyWC commented Jul 4, 2016

I solved it using:

git rebase --skip
@aditya43

This comment has been minimized.

Show comment
Hide comment
@aditya43

aditya43 Feb 16, 2018

Solved it by doing :

cd ~/.oh-my-zsh
git add .
git commit -am "Before updating ZSH"
upgrade_oh_my_zsh

Cheers!

aditya43 commented Feb 16, 2018

Solved it by doing :

cd ~/.oh-my-zsh
git add .
git commit -am "Before updating ZSH"
upgrade_oh_my_zsh

Cheers!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment