Fix infinite forking on Bash on Windows #429
Conversation
Detect conflicts by checking for existence of .git/index.lock file. The old way of varaible locking would not work because parallel checkout commands run in isolated sub processes, hence variables could not be shared. This fixes issue zplug#411. It repros when there are multiple plugins from the same repo, e.g. oh-my-zsh. OSX and Ubuntu seem to be fine by ignoring the errors, but Bash on Windows just hangs there when such conflict happens.
autoload/commands/__load__
Outdated
| @@ -66,6 +66,7 @@ do | |||
| "$fg[green]$repo$reset_color" | |||
| ;; | |||
| esac | |||
| exit $? | |||
There was a problem hiding this comment.
Is exit required here? I doubt that, but if so I think it should be added to other commands as well, including install, update and status
There was a problem hiding this comment.
I wasn't certain - I wasn't sure if there were any issues with the jobs dying in Bash on Windows and so I added that to have a greater degree of confidence that it would. I think it can be removed though - I'll do that as soon as I can.
There was a problem hiding this comment.
Removed the last commit that had this.
base/utils/git.zsh
Outdated
|
|
||
| __zplug::utils::git::is_git_locked() | ||
| { | ||
| [[ -e "$tags[dir]/.git/index.lock" || -e "$tags[dir]/.git/HEAD.lock" ]] |
There was a problem hiding this comment.
I think $tags[dir] should be passed in as arguments
There was a problem hiding this comment.
I'll change this as soon as I can.
|
Nice work. LGTM |
|
@b4b4r07 thanks. Would you be able to merge this then? |
Fixes #411, see that issue for a clearer idea of what this does.