Merge pull request #508 from mhinz/silence-deletions

Silence :delete commands

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,32 @@
+<!--
+### Before Submitting
+
+- You checked the [faq](https://github.com/junegunn/vim-plug/wiki/faq) for common problems.
+- Check your [requirements](https://github.com/junegunn/vim-plug/wiki/requirements) are satisfied.
+- You are not going to suggest vim-plug manage itself like Vundle, see #240, #364, #367 ...
+-->
+
+Explain the problem here ...
+
+------------------------------
+
+<!-- Put the contents of `:version` below -->
+```
+
+```
+
+<!-- Check all that apply. -->
+- Type:
+    - [ ] Bug
+    - [ ] Enhancement
+    - [ ] Feature Request
+    - [ ] Question
+- OS:
+    - [ ] All/Other
+    - [ ] Linux
+    - [ ] OS X
+    - [ ] Windows
+- Vim:
+    - [ ] Terminal Vim
+    - [ ] GVim
+    - [ ] Neovim

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,8 @@
+<!-- ## Before Submitting
+
+- You made sure the existing tests/travis build works.
+- You made sure any new features were tested where appropriate.
+- You checked a similar feature wasn't already turned down by searching issues & PRs.
+-->
+
+Describe the details of your PR ...

.travis.yml

@@ -1,35 +1,51 @@
 language: ruby
-rvm:
+sudo: false
-  - 1.8.7
+env:
-  - 1.9.2 # Test with vim-nox package on ubuntu
+  global:
-  - 1.9.3 # Test against python installer
+    - DEPS=$HOME/deps
-  - 2.0.0
+    - PATH=$DEPS/bin:$PATH
-  - 2.1.0 # Test against python3 installer
+matrix:
-
+  include:
-before_script: |
+    - env: ENV=nox
-  sudo apt-get update -y
+      rvm: 1.8.7
-  if [ $(ruby -e 'puts RUBY_VERSION') = 1.9.2 ]; then
+      addons: { apt: { packages: [vim-nox] } }
-    sudo apt-get install -y vim-nox
+    - env: ENV=python
-    sudo ln -s /usr/bin/vim /usr/local/bin/vim
+      rvm: 1.8.7
-  else
+      addons: { apt: { packages: [python2.7-dev] } }
-    git clone --depth 1 https://github.com/vim/vim
+    - env: ENV=python3
-    cd vim
+      rvm: 1.8.7
-    if [ $(ruby -e 'puts RUBY_VERSION') = 1.9.3 ]; then
+      addons: { apt: { packages: [python3-dev] } }
-      sudo apt-get install -y python2.7-dev
+    - env: ENV=ruby
-      ./configure --with-features=huge --enable-pythoninterp
+      rvm: 1.8.7
-    elif [ $(ruby -e 'puts RUBY_VERSION') = 2.1.0 ]; then
+    - env: ENV=ruby
-      sudo apt-get install -y python3-dev
+      rvm: 2.0.0
-      ./configure --with-features=huge --enable-python3interp
+install: |
-    else
-      ./configure --with-features=huge --enable-rubyinterp
-    fi
-    make
-    sudo make install
-    cd -
-  fi
-
   git config --global user.email "you@example.com"
   git config --global user.name "Your Name"
 
-script: |
+  if [ "$ENV" == "nox" ]; then
-  test/run !
+    mkdir -p ${DEPS}/bin
+    ln -s /usr/bin/vim.nox ${DEPS}/bin/vim
+    return
+  fi
+
+  C_OPTS="--prefix=$DEPS --with-features=huge --disable-gui "
+  case "$ENV" in
+    python)
+      C_OPTS+=--enable-pythoninterp
+      ;;
+    python3)
+      C_OPTS+=--enable-python3interp
+      ;;
+    ruby)
+      C_OPTS+=--enable-rubyinterp
+      ;;
+  esac
+
+  git clone --depth 1 https://github.com/vim/vim
+  cd vim
+  ./configure $C_OPTS
+  make
+  make install
+  cd -
+script: test/run !

README.md

@@ -14,7 +14,7 @@ A minimalist Vim plugin manager.
 - Creates shallow clones to minimize disk space usage and download time
 - On-demand loading for [faster startup time][startup-time]
 - Can review and rollback updates
-- Branch/tag support
+- Branch/tag/commit support
 - Post-update hooks
 - Support for externally managed plugins
 
@@ -22,25 +22,63 @@ A minimalist Vim plugin manager.
 [nv]: http://neovim.org/
 [startup-time]: http://junegunn.kr/images/vim-startup-time.png
 
-### Usage
+### Installation
 
 [Download plug.vim](https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim)
-and put it in ~/.vim/autoload
+and put it in the "autoload" directory.
+
+###### Unix
 
 ```sh
 curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
     https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
 ```
 
-Edit your .vimrc
+###### Neovim
+
+```sh
+curl -fLo ~/.config/nvim/autoload/plug.vim --create-dirs \
+    https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+```
+
+###### Windows (PowerShell)
+
+```powershell
+md ~\vimfiles\autoload
+$uri = 'https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
+(New-Object Net.WebClient).DownloadFile($uri, $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath("~\vimfiles\autoload\plug.vim"))
+```
+
+### Getting Help
+
+- See the [requirements] page for debugging information & tested configurations.
+- See the [FAQ] for common problems and questions.
+- Create an [issue](https://github.com/junegunn/vim-plug/issues/new).
+
+[FAQ]: https://github.com/junegunn/vim-plug/wiki/faq
+[requirements]: https://github.com/junegunn/vim-plug/wiki/requirements
+
+### Usage
+
+Add a vim-plug section to your `~/.vimrc` (or `~/.config/nvim/init.vim` for Neovim):
+
+1. Begin the section with `call plug#begin()`
+1. List the plugins with `Plug` commands
+1. `call plug#end()` to update `&runtimepath` and initialize plugin system
+
+#### Example
 
 ```vim
 call plug#begin('~/.vim/plugged')
 
 " Make sure you use single quotes
-Plug 'junegunn/seoul256.vim'
+
+" Shorthand notation; fetches https://github.com/junegunn/vim-easy-align
 Plug 'junegunn/vim-easy-align'
 
+" Any valid git URL is allowed
+Plug 'https://github.com/junegunn/vim-github-dashboard.git'
+
 " Group dependencies, vim-snippets depends on ultisnips
 Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
 
@@ -48,18 +86,22 @@ Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
 Plug 'scrooloose/nerdtree', { 'on':  'NERDTreeToggle' }
 Plug 'tpope/vim-fireplace', { 'for': 'clojure' }
 
-" Using git URL
+" Using a non-master branch
-Plug 'https://github.com/junegunn/vim-github-dashboard.git'
+Plug 'rdnetto/YCM-Generator', { 'branch': 'stable' }
+
+" Using a tagged release; wildcard allowed (requires git 1.9.2 or above)
+Plug 'fatih/vim-go', { 'tag': '*' }
 
 " Plugin options
 Plug 'nsf/gocode', { 'tag': 'v.20150303', 'rtp': 'vim' }
 
 " Plugin outside ~/.vim/plugged with post-update hook
-Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': 'yes \| ./install' }
+Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
 
 " Unmanaged plugin (manually installed and updated)
 Plug '~/my-prototype-plugin'
 
+" Add plugins to &runtimepath
 call plug#end()
 ```
 
@@ -74,16 +116,17 @@ Reload .vimrc and `:PlugInstall` to install plugins.
 | `PlugClean[!]`                      | Remove unused directories (bang version will clean without prompt) |
 | `PlugUpgrade`                       | Upgrade vim-plug itself                                            |
 | `PlugStatus`                        | Check the status of plugins                                        |
-| `PlugDiff`                          | See the updated changes from the previous PlugUpdate               |
+| `PlugDiff`                          | Examine changes from the previous update and the pending changes   |
-| `PlugSnapshot [output path]`        | Generate script for restoring the current snapshot of the plugins  |
+| `PlugSnapshot[!] [output path]`     | Generate script for restoring the current snapshot of the plugins  |
 
 ### `Plug` options
 
 | Option                  | Description                                      |
-| -------------- | ------------------------------------------------ |
+| ----------------------- | ------------------------------------------------ |
-| `branch`/`tag` | Branch or tag of the repository to use           |
+| `branch`/`tag`/`commit` | Branch/tag/commit of the repository to use       |
 | `rtp`                   | Subdirectory that contains Vim plugin            |
 | `dir`                   | Custom directory for the plugin                  |
+| `as`                    | Use different name for the plugin                |
 | `do`                    | Post-update hook (string or funcref)             |
 | `on`                    | On-demand loading: Commands or `<Plug>`-mappings |
 | `for`                   | On-demand loading: File types                    |
@@ -98,7 +141,9 @@ Reload .vimrc and `:PlugInstall` to install plugins.
 | `g:plug_retries`    | 2                                 | Number of retries in case of timeout (*Ruby & Python*) |
 | `g:plug_shallow`    | 1                                 | Use shallow clone                                      |
 | `g:plug_window`     | `vertical topleft new`            | Command to open plug window                            |
-| `g:plug_url_format` | `https://git::@github.com/%s.git` | `printf` format to build repo URL                      |
+| `g:plug_pwindow`    | `above 12new`                     | Command to open preview window in `PlugDiff`           |
+| `g:plug_url_format` | `https://git::@github.com/%s.git` | `printf` format to build repo URL (Only applies to the subsequent `Plug` commands) |
+
 
 ### Keybindings
 
@@ -138,9 +183,9 @@ Plug 'kovisoft/paredit', { 'for': ['clojure', 'scheme'] }
 " On-demand loading on both conditions
 Plug 'junegunn/vader.vim',  { 'on': 'Vader', 'for': 'vader' }
 
-" Code to execute when the plugin is loaded on demand
+" Code to execute when the plugin is lazily loaded on demand
-Plug 'Valloric/YouCompleteMe', { 'for': 'cpp' }
+Plug 'junegunn/goyo.vim', { 'for': 'markdown' }
-autocmd! User YouCompleteMe call youcompleteme#Enable()
+autocmd! User goyo.vim echom 'Goyo is now loaded!'
 ```
 
 `for` option is generally not needed as most plugins for specific file types
@@ -154,7 +199,13 @@ In that case, use `do` option to describe the task to be performed.
 
 ```vim
 Plug 'Shougo/vimproc.vim', { 'do': 'make' }
-Plug 'Valloric/YouCompleteMe', { 'do': './install.sh' }
+Plug 'Valloric/YouCompleteMe', { 'do': './install.py' }
+```
+
+If the value starts with `:`, it will be recognized as a Vim command.
+
+```vim
+Plug 'fatih/vim-go', { 'do': ':GoInstallBinaries' }
 ```
 
 If you need more control, you can pass a reference to a Vim function that
@@ -167,7 +218,7 @@ function! BuildYCM(info)
   " - status: 'installed', 'updated', or 'unchanged'
   " - force:  set on PlugInstall! or PlugUpdate!
   if a:info.status == 'installed' || a:info.force
-    !./install.sh
+    !./install.py
   endif
 endfunction
 
@@ -195,9 +246,17 @@ let g:fzf_install = 'yes | ./install'
 Plug 'junegunn/fzf', { 'do': g:fzf_install }
 ```
 
-### FAQ/Troubleshooting
+### `PlugInstall!` and `PlugUpdate!`
 
-See [FAQ/Troubleshooting](https://github.com/junegunn/vim-plug/wiki/faq).
+The installer takes the following steps when installing/updating a plugin:
+
+1. `git clone` or `git fetch` from its origin
+2. Check out branch, tag, or commit and optionally `git merge` remote branch
+3. If the plugin was updated (or installed for the first time)
+    1. Update submodules
+    2. Execute post-update hooks
+
+The commands with `!` suffix ensure that all steps are run unconditionally.
 
 ### Articles
 

test/regressions.vader

@@ -7,19 +7,19 @@ Execute (#112 On-demand loading should not suppress messages from ftplugin):
   redir => out
   tabnew a.c
   redir END
-  Assert stridx(out, 'ftplugin') >= 0
+  Assert stridx(out, 'ftplugin-c') >= 0
 
 * The same applies to plug#load())
   redir => out
   call plug#load('ftplugin-msg')
   redir END
-  Assert stridx(out, 'ftplugin') >= 0
+  Assert stridx(out, 'ftplugin-c') >= 0
   q
 
 
 **********************************************************************
 Execute (#114 Should not contain empty path in &rtp):
-  call plug#begin('/tmp/plugged')
+  call plug#begin('/tmp/vim-plug-test/plugged')
   call plug#end()
 
   Log &rtp
@@ -35,7 +35,7 @@ Execute (#130 Proper cleanup of on-demand loading triggers):
 
   " Cleared on command
   call ReloadPlug()
-  call plug#begin('/tmp/plugged')
+  call plug#begin('/tmp/vim-plug-test/plugged')
   Plug 'junegunn/vim-emoji', { 'on':  ['EmojiCommand', 'EmojiCommand2', '<Plug>(EmojiMapping)'] }
   call plug#end()
   PlugInstall | q
@@ -52,7 +52,7 @@ Execute (#130 Proper cleanup of on-demand loading triggers):
 
   " Cleared on FileType
   call ReloadPlug()
-  call plug#begin('/tmp/plugged')
+  call plug#begin('/tmp/vim-plug-test/plugged')
   Plug 'junegunn/vim-emoji', { 'on': ['EmojiCommandExtra', '<Plug>(EmojiMappingExtra)'], 'for': ['emoji'] }
   call plug#end()
 
@@ -78,13 +78,13 @@ Execute (#131 Syntax error):
 **********************************************************************
 Execute (#139-1 Using new remote branch):
   " Make sure to remove the clone
-  call plug#begin('/tmp/plugged')
+  call plug#begin('/tmp/vim-plug-test/plugged')
   call plug#end()
   PlugClean!
 
   " Install master branch
-  call plug#begin('/tmp/plugged')
+  call plug#begin('/tmp/vim-plug-test/plugged')
-  Plug expand('file:////tmp/new-branch')
+  Plug expand('file:////tmp/vim-plug-test/new-branch')
   call plug#end()
   PlugUpdate
 
@@ -95,14 +95,14 @@ Execute (#139-1 Using new remote branch):
   Assert !exists('g:baz'), 'g:baz should not be found'
 
   " Create a new branch on origin
-  call system('cd /tmp/new-branch && git checkout -b new &&'
+  call system('cd /tmp/vim-plug-test/new-branch && git checkout -b new &&'
       \. 'echo "let g:bar = 1" > plugin/bar.vim && git add plugin/bar.vim &&'
       \. 'git commit -m second')
 
   " We're setting up two plugins so that parallel installer is used
-  call plug#begin('/tmp/plugged')
+  call plug#begin('/tmp/vim-plug-test/plugged')
   Plug 'junegunn/seoul256.vim'
-  Plug expand('file:////tmp/new-branch'), { 'branch': 'new' }
+  Plug expand('file:////tmp/vim-plug-test/new-branch'), { 'branch': 'new' }
   call plug#end()
   PlugUpdate
   silent %y
@@ -125,14 +125,14 @@ Expect:
 
 Execute (#139-2 Using yet another new remote branch):
   " Create another branch on origin
-  call system('cd /tmp/new-branch && git checkout master &&'
+  call system('cd /tmp/vim-plug-test/new-branch && git checkout master &&'
       \. 'git checkout -b brand-new &&'
       \. 'echo "let g:baz = 1" > plugin/baz.vim && git add plugin/baz.vim &&'
       \. 'git commit -m third')
 
   " Test Vim installer here
-  call plug#begin('/tmp/plugged')
+  call plug#begin('/tmp/vim-plug-test/plugged')
-  Plug expand('file:////tmp/new-branch'), { 'branch': 'brand-new' }
+  Plug expand('file:////tmp/vim-plug-test/new-branch'), { 'branch': 'brand-new' }
   call plug#end()
   PlugUpdate
   silent %y
@@ -154,19 +154,19 @@ Expect:
 
 Execute (#139-3 Should fail when not possible to fast-forward):
   " Commit on cloned repo
-  call system('cd /tmp/plugged/new-branch && git checkout master &&'
+  call system('cd /tmp/vim-plug-test/plugged/new-branch && git checkout master &&'
       \. 'touch foobar && git add foobar && git commit -m foobar')
 
   " Different commit on remote
-  call system('cd /tmp/new-branch && git checkout master &&'
+  call system('cd /tmp/vim-plug-test/new-branch && git checkout master &&'
       \. 'touch foobaz && git add foobaz && git commit -m foobaz')
 
   for multi in [0, 1]
-    call plug#begin('/tmp/plugged')
+    call plug#begin('/tmp/vim-plug-test/plugged')
     if multi
       Plug 'junegunn/seoul256.vim'
     endif
-    Plug expand('file:////tmp/new-branch')
+    Plug expand('file:////tmp/vim-plug-test/new-branch')
     call plug#end()
     PlugUpdate
     silent %y
@@ -210,7 +210,7 @@ Execute (#159: shell=/bin/tcsh):
   let org = &shell
   try
     set shell=/bin/tcsh
-    call plug#begin('/tmp/plugged')
+    call plug#begin('/tmp/vim-plug-test/plugged')
     Plug 'junegunn/seoul256.vim'
     call plug#end()
 
@@ -224,7 +224,7 @@ Execute (#159: shell=/bin/tcsh):
 
 **********************************************************************
 Execute (#154: Spaces in &rtp should not be escaped):
-  call plug#begin('/tmp/plug it')
+  call plug#begin('/tmp/vim-plug-test/plug it')
   Plug 'seoul256 vim'
   call plug#end()
   Log &rtp
@@ -232,7 +232,7 @@ Execute (#154: Spaces in &rtp should not be escaped):
 
 **********************************************************************
 Execute (#184: Duplicate entries in &rtp):
-  call plug#begin('/tmp/plugged')
+  call plug#begin('/tmp/vim-plug-test/plugged')
   Plug 'plugin1'
     \| Plug 'plugin0'
 
@@ -250,7 +250,7 @@ Execute (#236: Plugin removed from &rtp when .vimrc is reloaded):
   silent! delc EasyAlign
 
   call ReloadPlug()
-  call plug#begin('/tmp/plugged')
+  call plug#begin('/tmp/vim-plug-test/plugged')
   Plug 'junegunn/vim-easy-align', { 'on': 'EasyAlign' }
   call plug#end()
   PlugInstall | q
@@ -259,7 +259,74 @@ Execute (#236: Plugin removed from &rtp when .vimrc is reloaded):
   %EasyAlign=
   Assert &rtp =~ '/vim-easy-align', 'Plugin should be in &rtp'
 
-  call plug#begin('/tmp/plugged')
+  call plug#begin('/tmp/vim-plug-test/plugged')
   Plug 'junegunn/vim-easy-align', { 'on': 'EasyAlign' }
   call plug#end()
   Assert &rtp =~ '/vim-easy-align', 'Plugin should still be in &rtp'
+
+**********************************************************************
+Execute (#350: Ruby installer failed to unshallow tagged plugin on update):
+  call plug#begin('/tmp/vim-plug-test/plugged')
+  call plug#end()
+  PlugClean!
+
+  " Shallow clone. We should have at least 2 plugins to enable parallel installer.
+  call plug#begin('/tmp/vim-plug-test/plugged')
+  Plug 'junegunn/vim-easy-align'
+  Plug 'junegunn/seoul256.vim'
+  call plug#end()
+  PlugUpdate
+  Assert filereadable(g:plugs['vim-easy-align'].dir.'/.git/shallow')
+
+  " Now unshallowed
+  call plug#begin('/tmp/vim-plug-test/plugged')
+  Plug 'junegunn/vim-easy-align', { 'tag': '2.9.0' }
+  Plug 'junegunn/seoul256.vim'
+  call plug#end()
+  PlugUpdate
+  Assert !filereadable(g:plugs['vim-easy-align'].dir.'/.git/shallow')
+  q
+
+**********************************************************************
+Execute (#474: Load ftdetect files in filetypedetect augroup):
+  call plug#begin('/tmp/vim-plug-test/plugged')
+  Plug 'junegunn/rust.vim', { 'for': 'rust', 'commit': '115d321d383eb96d438466c56cc871fcc1bd0faa' }
+  call plug#end()
+  PlugInstall!
+  q
+
+  tabnew /tmp/vim-plug-test/any.rs
+  AssertEqual 'rust', &filetype
+  Log &filetype
+  filetype detect
+  AssertEqual 'rust', &filetype
+  Log &filetype
+  bd
+
+**********************************************************************
+Execute (#489 On-demand loading with 'on' option should trigger BufRead autocmd):
+  call plug#begin('$PLUG_FIXTURES')
+  Plug 'ftplugin-msg', { 'on': 'XXX' }
+  call plug#end()
+
+  tabnew a.java
+  redir => out
+  silent! XXX
+  redir END
+  Assert stridx(out, 'ftplugin-java') >= 0
+  q
+
+**********************************************************************
+Execute (Cursor moved to another window during post-update hook):
+  function! DoSplit(...)
+    new
+    call setline(1, 'empty')
+  endfunction
+  call plug#begin('/tmp/vim-plug-test/plugged')
+  Plug 'junegunn/rust.vim', { 'do': function('DoSplit') }
+  call plug#end()
+  PlugInstall!
+  AssertEqual 1, line('$')
+  AssertEqual 'empty', getline(1)
+  q!
+  q

test/run

@@ -6,9 +6,12 @@ export BASE="$PWD"
 export PLUG_SRC="$PWD/../plug.vim"
 export PLUG_FIXTURES="$PWD/fixtures"
 mkdir -p "$PLUG_FIXTURES"
+export TEMP=/tmp/vim-plug-test
+rm -rf "$TEMP"
+mkdir -p "$TEMP"
 
-cat > /tmp/mini-vimrc << VIMRC
+cat > $TEMP/mini-vimrc << VIMRC
-set rtp+=/tmp/junegunn/vader.vim
+set rtp+=$TEMP/junegunn/vader.vim
 set shell=/bin/bash
 VIMRC
 
@@ -18,8 +21,8 @@ clone() {
   fi
 }
 
-clone_repos() {
+clone_repos() (
-  cd /tmp
+  cd $TEMP
   mkdir -p junegunn vim-scripts jg
   for repo in vader.vim goyo.vim rust.vim seoul256.vim vim-easy-align vim-fnr \
               vim-oblique vim-pseudocl vim-redis vim-emoji; do
@@ -27,15 +30,15 @@ clone_repos() {
   done
   clone https://github.com/vim-scripts/beauty256.git vim-scripts/beauty256 &
   clone https://github.com/junegunn/fzf.git fzf &
+  clone https://github.com/yous/subsubmodule.git yous/subsubmodule && \
+    (cd yous/subsubmodule && git submodule update --init --recursive &) &
   wait
 
   clone junegunn/vim-emoji jg/vim-emoji
   cd junegunn/seoul256.vim && git checkout no-t_co && git checkout master
+)
 
-  cd "$BASE"
+make_dirs() (
-}
-
-make_dirs() {
   rm -rf "$PLUG_FIXTURES/$1"
   mkdir -p "$PLUG_FIXTURES/$1"
   cd "$PLUG_FIXTURES/$1"
@@ -51,9 +54,13 @@ make_dirs() {
     call add(g:total_order, s:name)
 EOF
   done
+)
 
-  cd "$BASE"
+gitinit() (
-}
+  cd "$PLUG_FIXTURES/$1"
+  git init
+  git commit -m 'commit' --allow-empty
+)
 
 prepare() {
   make_dirs xxx/ xxx
@@ -62,19 +69,22 @@ prepare() {
   cat > "$PLUG_FIXTURES/xxx/doc/xxx.txt" << DOC
 hello *xxx*
 DOC
+  gitinit xxx
 
   make_dirs yyy/ yyy
   make_dirs yyy/after yyy
+  gitinit yyy
 
   make_dirs z1/ z1
   make_dirs z2/ z2
 
   rm -rf "$PLUG_FIXTURES/ftplugin-msg"
   mkdir -p "$PLUG_FIXTURES/ftplugin-msg/ftplugin"
-  echo "echomsg 'ftplugin'" > "$PLUG_FIXTURES/ftplugin-msg/ftplugin/c.vim"
+  echo "echomsg 'ftplugin-c'" > "$PLUG_FIXTURES/ftplugin-msg/ftplugin/c.vim"
+  echo "echomsg 'ftplugin-java'" > "$PLUG_FIXTURES/ftplugin-msg/ftplugin/java.vim"
 
-  rm -rf /tmp/new-branch
+  rm -rf $TEMP/new-branch
-  cd /tmp
+  cd $TEMP
   git init new-branch
   cd new-branch
   mkdir plugin
@@ -85,13 +95,27 @@ DOC
   cd "$BASE"
 }
 
+select_vim() {
+  local vim=/usr/bin/vim
+  if [ -n "$DEPS" ] && [ -e "${DEPS}/bin/vim" ]; then
+    vim="${DEPS}/bin/vim"
+  elif [ -e "/usr/local/bin/vim" ]; then
+    vim=/usr/local/bin/vim
+  fi
+  echo $vim
+}
+
 clone_repos
 prepare
+
+git --version
+VIM=$(select_vim)
+echo "Selected Vim: $VIM"
 if [ "$1" = '!' ]; then
-  /usr/local/bin/vim -Nu /tmp/mini-vimrc -c 'Vader! test.vader' > /dev/null &&
+  $VIM -Nu $TEMP/mini-vimrc -c 'Vader! test.vader' > /dev/null &&
   prepare &&
-  /usr/local/bin/vim -Nu /tmp/mini-vimrc -c 'let g:plug_threads = 1 | Vader! test.vader' > /dev/null
+  $VIM -Nu $TEMP/mini-vimrc -c 'let g:plug_threads = 1 | Vader! test.vader' > /dev/null
 else
-  /usr/local/bin/vim -Nu /tmp/mini-vimrc -c 'Vader test.vader'
+  $VIM -Nu $TEMP/mini-vimrc -c 'Vader test.vader'
 fi
 

test/test.vader

@@ -2,7 +2,7 @@ Execute (Initialize test environment):
   Save &rtp, g:plugs, g:plug_home, g:plug_window
   unlet! g:plugs g:plug_home g:plug_window
 
-  let g:plug_url_format = 'file:///tmp/%s'
+  let g:plug_url_format = 'file:///tmp/vim-plug-test/%s'
   let g:base_rtp        = &rtp
   let g:first_rtp       = split(&rtp, ',')[0]
   let g:last_rtp        = split(&rtp, ',')[-1]
@@ -10,11 +10,12 @@ Execute (Initialize test environment):
   if !exists('$PLUG_SRC')
     let $PLUG_SRC = globpath(&rtp, 'autoload/plug.vim')
   endif
+  let $PLUG_TMP = fnamemodify(tempname(), ':h').'/plug.vim'
 
   " Temporarily patch plug.vim
-  call system('cp $PLUG_SRC $PLUG_SRC.org')
+  call system('cp "$PLUG_SRC" "$PLUG_TMP"')
-  call writefile(extend(readfile($PLUG_SRC),
+  call writefile(extend(readfile($PLUG_TMP),
-  \ ['function! ResetPlug()', 'let s:loaded = {}', 'endfunction']), $PLUG_SRC)
+  \ ['function! ResetPlug()', 'let s:loaded = {}', 'endfunction']), $PLUG_TMP)
 
   set t_Co=256
   colo default
@@ -47,11 +48,23 @@ Execute (Initialize test environment):
 
   function! ReloadPlug()
     call ResetPlug()
-    source $PLUG_SRC
+    source $PLUG_TMP
     let &rtp = g:base_rtp
   endfunction
 
-  source $PLUG_SRC
+  function! GitBranch(repo)
+    return system(printf('cd %s && git rev-parse --abbrev-ref HEAD', g:plugs[a:repo].dir))[:-2]
+  endfunction
+
+  function! GitTag(repo)
+    return system(printf('cd %s && git describe --tags', g:plugs[a:repo].dir))[:-2]
+  endfunction
+
+  function! GitCommit(repo)
+    return system(printf('cd %s && git rev-parse HEAD', g:plugs[a:repo].dir))[:-2]
+  endfunction
+
+  source $PLUG_TMP
 
 Execute (Print Interpreter Version):
   redir => out
@@ -80,7 +93,7 @@ Execute (Cleanup):
   silent! delc AssertExpect
   silent! unmap /
   silent! unmap ?
-  call system('mv $PLUG_SRC.org $PLUG_SRC')
+  call delete($PLUG_TMP)
 
   Restore
 

test/workflow.vader

@@ -34,7 +34,7 @@ Execute (Subsequent plug#begin() calls will reuse g:plug_home):
 Execute (Test Plug command):
 ^ Git repo with branch (DEPRECATED. USE BRANCH OPTION)
   Plug 'junegunn/seoul256.vim', { 'branch': 'yes-t_co' }
-  AssertEqual 'file:///tmp/junegunn/seoul256.vim', g:plugs['seoul256.vim'].uri
+  AssertEqual 'file:///tmp/vim-plug-test/junegunn/seoul256.vim', g:plugs['seoul256.vim'].uri
   AssertEqual join([g:temp_plugged, 'seoul256.vim/'], '/'), g:plugs['seoul256.vim'].dir
   AssertEqual 'yes-t_co', g:plugs['seoul256.vim'].branch
 
@@ -43,7 +43,7 @@ Execute (Test Plug command):
 
 ^ Git repo with tag (DEPRECATED. USE TAG OPTION)
   Plug 'junegunn/goyo.vim', '1.5.2'
-  AssertEqual 'file:///tmp/junegunn/goyo.vim', g:plugs['goyo.vim'].uri
+  AssertEqual 'file:///tmp/vim-plug-test/junegunn/goyo.vim', g:plugs['goyo.vim'].uri
   AssertEqual join([g:temp_plugged, 'goyo.vim/'], '/'), g:plugs['goyo.vim'].dir
   AssertEqual '1.5.2', g:plugs['goyo.vim'].tag
 
@@ -51,14 +51,14 @@ Execute (Test Plug command):
   AssertEqual '1.5.3', g:plugs['goyo.vim'].tag
 
   " Git URI
-  Plug 'file:///tmp/jg/vim-emoji'
+  Plug 'file:///tmp/vim-plug-test/jg/vim-emoji'
-  AssertEqual 'file:///tmp/jg/vim-emoji', g:plugs['vim-emoji'].uri
+  AssertEqual 'file:///tmp/vim-plug-test/jg/vim-emoji', g:plugs['vim-emoji'].uri
   AssertEqual 'master', g:plugs['vim-emoji'].branch
   AssertEqual join([g:temp_plugged, 'vim-emoji/'], '/'), g:plugs['vim-emoji'].dir
 
   " vim-scripts/
   Plug 'beauty256'
-  AssertEqual 'file:///tmp/vim-scripts/beauty256', g:plugs.beauty256.uri
+  AssertEqual 'file:///tmp/vim-plug-test/vim-scripts/beauty256', g:plugs.beauty256.uri
   AssertEqual 'master', g:plugs.beauty256.branch
 
   AssertEqual 4, len(g:plugs)
@@ -83,6 +83,10 @@ Execute (PlugClean before installation):
   q
 
 Execute (plug#end() updates &rtp):
+  " Plug 'junegunn/goyo.vim', { 'tag': '1.5.3' }
+  " Plug 'file:///tmp/vim-plug-test/jg/vim-emoji'
+  " Plug 'beauty256'
+  " Plug 'junegunn/seoul256.vim', { 'branch': 'no-t_co', 'rtp': '././' }
   call plug#end()
   Assert len(&rtp) > len(g:base_rtp)
   AssertEqual g:first_rtp, split(&rtp, ',')[0]
@@ -155,7 +159,7 @@ Expect:
 Execute (Change branch of seoul256.vim):
   call plug#begin()
   Plug 'junegunn/seoul256.vim'
-  Plug 'file:///tmp/jg/vim-emoji'
+  Plug 'file:///tmp/vim-plug-test/jg/vim-emoji'
   call plug#end()
 
 Execute (PlugStatus):
@@ -193,21 +197,39 @@ Expect:
 Execute (Change URI of seoul256.vim):
   call plug#begin()
   Plug 'junegunn.choi/seoul256.vim'
-  Plug 'file:///tmp/jg/vim-emoji'
+  Plug 'file:///tmp/vim-plug-test/jg/vim-emoji'
   call plug#end()
 
 Execute (PlugStatus):
   call PlugStatusSorted()
 
 Expect:
-      Expected:    file:///tmp/junegunn.choi/seoul256.vim
+      Expected:    file:///tmp/vim-plug-test/junegunn.choi/seoul256.vim
-      Invalid URI: file:///tmp/junegunn/seoul256.vim
+      Invalid URI: file:///tmp/vim-plug-test/junegunn/seoul256.vim
       PlugClean required.
   - vim-emoji: OK
   Finished. 1 error(s).
   [==]
   x seoul256.vim:
 
+Execute (Corrected the URI but diverged from master):
+  call plug#begin()
+  Plug 'junegunn/seoul256.vim'
+  Plug 'file:///tmp/vim-plug-test/jg/vim-emoji'
+  call plug#end()
+  for _ in range(3)
+    call system(printf('cd "%s" && git commit --allow-empty -m "dummy"', g:plugs['seoul256.vim'].dir))
+  endfor
+  call PlugStatusSorted()
+
+Expect:
+      Diverged from origin/master by 3 commit(s).
+      Reinstall after PlugClean.
+  - vim-emoji: OK
+  Finished. 1 error(s).
+  [==]
+  x seoul256.vim:
+
 # TODO: does not work due to inputsave()
 # Do (PlugClean):
 #   :PlugClean\<Enter>y\<Enter>
@@ -218,8 +240,9 @@ Expect:
 Execute (PlugClean! to remove seoul256.vim):
   PlugClean!
   " Three removed, emoji left
-  AssertExpect '^- ', 3
+  AssertEqual 'Removed 3 directories.', getline(4)
-  AssertExpect 'Removed', 1
+  AssertExpect '^\~ ', 3
+  AssertExpect 'Diverged', 1
   Assert empty(globpath(&rtp, 'colors/seoul256.vim'))
   Assert !empty(globpath(&rtp, 'autoload/emoji.vim'))
   q
@@ -234,8 +257,8 @@ Execute (PlugStatus):
   call PlugStatusSorted()
 
 Expect:
-      Expected:    file:///tmp/junegunn/vim-emoji
+      Expected:    file:///tmp/vim-plug-test/junegunn/vim-emoji
-      Invalid URI: file:///tmp/jg/vim-emoji
+      Invalid URI: file:///tmp/vim-plug-test/jg/vim-emoji
       Not found. Try PlugInstall.
       PlugClean required.
   Finished. 2 error(s).
@@ -245,8 +268,8 @@ Expect:
 
 Execute (PlugClean! to remove vim-emoji):
   PlugClean!
-  AssertExpect '^- ', 1
+  AssertExpect '^\~ ', 1
-  AssertExpect 'Removed', 1
+  AssertEqual 'Removed 1 directories.', getline(4)
   Assert empty(globpath(&rtp, 'colors/seoul256.vim'))
   Assert empty(globpath(&rtp, 'autoload/emoji.vim'))
   q
@@ -262,18 +285,22 @@ Execute (PlugUpdate only to find out plugins are up-to-date, D key to check):
   PlugUpdate
   AssertExpect 'Already up-to-date', 2
   normal D
-  AssertEqual 'No updates.', getline(1)
+  AssertEqual '0 plugin(s) updated.', getline(1)
   q
 
 Execute (PlugDiff - 'No updates.'):
   PlugDiff
-  AssertEqual 'No updates.', getline(1)
+  Log getline(1, '$')
+  AssertEqual '0 plugin(s) updated.', getline(1)
+  Assert empty(mapcheck('o'))
+  Assert empty(mapcheck('X'))
+  Assert empty(mapcheck("\<cr>"))
   q
 
 Execute (New commits on remote, PlugUpdate, then PlugDiff):
   for repo in ['seoul256.vim', 'vim-emoji']
     for _ in range(2)
-      call system(printf('cd /tmp/junegunn/%s && git commit --allow-empty -m "update"', repo))
+      call system(printf('cd /tmp/vim-plug-test/junegunn/%s && git commit --allow-empty -m "update"', repo))
     endfor
   endfor
   unlet repo
@@ -281,7 +308,7 @@ Execute (New commits on remote, PlugUpdate, then PlugDiff):
 
   " Now we have updates
   normal D
-  AssertEqual 'Last update:', getline(1)
+  AssertEqual '2 plugin(s) updated.', getline(1)
 
   " Preview commit
   silent! wincmd P
@@ -338,6 +365,22 @@ Execute (New commits on remote, PlugUpdate, then PlugDiff):
   AssertEqual 1, &previewwindow
   pclose
 
+Execute (Test g:plug_pwindow):
+  let g:plug_pwindow = 'below 5new'
+  PlugDiff
+  AssertExpect '^- ', 1
+  execute "normal ]]jo"
+
+  AssertEqual 0, &previewwindow
+  AssertEqual 1, winnr()
+  wincmd P
+  AssertEqual 1, &previewwindow
+  AssertEqual 2, winnr()
+  AssertEqual 5, winheight('.')
+  wincmd p
+  normal q
+  unlet g:plug_pwindow
+
 Execute (Reuse Plug window in another tab):
   let tabnr = tabpagenr()
   PlugDiff
@@ -352,6 +395,75 @@ Execute (Reuse Plug window in another tab):
   q
   unlet tabnr
 
+Execute (contd. PlugDiff should not show inverted history):
+  " Additional PlugUpdate to clear diff
+  PlugUpdate
+  PlugDiff
+  Log getline(1, '$')
+
+  " Checking out older revisions
+  for repo in values(g:plugs)
+    call system(printf('cd %s && git reset HEAD^ --hard', shellescape(repo.dir)))
+  endfor
+  unlet repo
+
+  " PlugDiff should not report the changes i.e. git log --left-only
+  PlugDiff
+  Log getline(1, '$')
+  AssertEqual '0 plugin(s) updated.', getline(1)
+  q
+
+**********************************************************************
+~ PlugDiff to see the pending changes
+**********************************************************************
+
+Execute (PlugDiff):
+  call plug#begin()
+  call plug#end()
+  PlugClean!
+
+  call plug#begin()
+  Plug 'file://'.expand('$PLUG_FIXTURES').'/xxx'
+  Plug 'file://'.expand('$PLUG_FIXTURES').'/yyy'
+  call plug#end()
+  PlugInstall
+  Log getline(1, '$')
+
+  call system('cd "$PLUG_FIXTURES/xxx" && git commit --allow-empty -m update-xxx && git tag -f xxx')
+  call system('cd "$PLUG_FIXTURES/yyy" && git tag -f yyy && git commit --allow-empty -m update-yyy && git tag -f zzz')
+
+  let g:plugs.yyy.tag = 'yyy'
+  PlugUpdate
+  Log getline(1, '$')
+
+  PlugDiff
+  " 1 plugin(s) updated. 1 plugin(s) have pending updates.
+  " [==]
+  "
+  " Last update:
+  " ------------
+  "
+  " - xxx:
+  "   166cfff (tag: xxx) update-xxx (1 second ago)
+  "
+  " Pending updates:
+  " ----------------
+  "
+  " - yyy: (tag: yyy)
+  "   c0a064b (tag: zzz) update-yyy (1 second ago)
+  "
+  Log getline(1, '$')
+  AssertEqual 15, line('$')
+  AssertEqual '1 plugin(s) updated. 1 plugin(s) have pending updates.', getline(1)
+  AssertEqual '[==]', getline(2)
+  AssertEqual '- yyy: (tag: yyy)', getline(13)
+  Assert getline(8) =~ '(tag: xxx)'
+  Assert getline(14) =~ '(tag: zzz)'
+  Assert !empty(mapcheck('o'))
+  Assert !empty(mapcheck('X'))
+  Assert !empty(mapcheck("\<cr>"))
+  q
+
 **********************************************************************
 ~ On-demand loading / Partial installation/update ~
 **********************************************************************
@@ -500,7 +612,7 @@ Execute (PlugStatus should point out that the plugin is missing):
 Execute (Deploy unmanaged plugin):
   Assert !exists(':FZF'), ':FZF command should not exist'
   call RmRf(fzf)
-  Log system(printf('cp -r "/tmp/fzf" "%s"', fzf))
+  Log system(printf('cp -r "/tmp/vim-plug-test/fzf" "%s"', fzf))
 
 Execute (PlugUpdate still should not care):
   PlugUpdate
@@ -648,6 +760,9 @@ Execute (On install):
   call plug#begin()
   Plug 'junegunn/vim-easy-align', { 'do': 'touch installed' }
   Plug 'junegunn/vim-pseudocl'
+  Plug 'junegunn/seoul256.vim'
+  Plug 'junegunn/goyo.vim'
+  Plug 'yous/subsubmodule'
   call plug#end()
 
   silent PlugInstall
@@ -657,15 +772,20 @@ Execute (On install):
     \ 'vim-easy-align/installed should exist'
   Assert !filereadable(g:plugs['vim-pseudocl'].dir.'/installed'),
     \ 'vim-pseudocl/installed should not exist'
+  AssertEqual ' ', system('cd '.g:plugs['subsubmodule'].dir.' && git submodule status')[0],
+    \ 'subsubmodule/subsubmodule should be initialized'
 
 Execute (On update):
   call plug#begin()
   Plug 'junegunn/vim-easy-align', { 'do': 'touch updated' }
   Plug 'junegunn/vim-pseudocl', { 'do': 'touch updated' }
+  Plug 'junegunn/seoul256.vim'
+  Plug 'junegunn/goyo.vim'
+  Plug 'yous/subsubmodule'
   call plug#end()
 
   " New commits on remote
-  call system('cd /tmp/junegunn/vim-pseudocl && git commit --allow-empty -m "update"')
+  call system('cd /tmp/vim-plug-test/junegunn/vim-pseudocl && git commit --allow-empty -m "update"')
 
   silent PlugUpdate
   Log getline(1, '$')
@@ -679,44 +799,73 @@ Execute (On update):
 Execute (When already installed):
   call plug#begin()
   Plug 'junegunn/vim-easy-align', { 'do': 'touch installed2' }
-  Plug 'junegunn/vim-pseudocl', { 'do': 'touch installed2' }
+  Plug 'junegunn/vim-pseudocl', { 'commit': '7f8cd78' }
+  Plug 'junegunn/seoul256.vim', { 'branch': 'no-t_co' }
+  Plug 'junegunn/goyo.vim', { 'tag': '1.5.3' }
+  Plug 'yous/subsubmodule'
   call plug#end()
 
   PlugInstall
   q
   Assert !filereadable(g:plugs['vim-easy-align'].dir.'/installed2'),
     \ 'vim-easy-align/installed2 should not exist'
-  Assert !filereadable(g:plugs['vim-pseudocl'].dir.'/installed2'),
+  AssertNotEqual '7f8cd78cb1fe52185b98b16a3749811f0cc508af', GitCommit('vim-pseudocl')
-    \ 'vim-pseudocl/installed2 should not exist'
+  AssertNotEqual 'no-t_co', GitBranch('seoul256.vim')
+  AssertNotEqual '1.5.3', GitTag('goyo.vim')
 
 Execute (PlugInstall!):
   silent PlugInstall!
   q
   Assert filereadable(g:plugs['vim-easy-align'].dir.'/installed2'),
     \ 'vim-easy-align/installed2 should exist'
-  Assert filereadable(g:plugs['vim-pseudocl'].dir.'/installed2'),
+  AssertEqual '7f8cd78cb1fe52185b98b16a3749811f0cc508af', GitCommit('vim-pseudocl')
-    \ 'vim-pseudocl/installed2 should exist'
+  AssertEqual 'no-t_co', GitBranch('seoul256.vim')
+  AssertEqual '1.5.3', GitTag('goyo.vim')
+
+Execute (When submodules are not initialized):
+  call system(printf('cd %s && git submodule deinit subsubmodule', g:plugs['subsubmodule'].dir))
+
+  silent PlugInstall!
+  q
+
+  AssertEqual ' ', system(printf('cd %s && git submodule status', g:plugs['subsubmodule'].dir))[0],
+    \ 'subsubmodule/subsubmodule should be initialized'
 
 Execute (When already updated):
   call plug#begin()
   Plug 'junegunn/vim-easy-align', { 'do': 'touch updated2' }
-  Plug 'junegunn/vim-pseudocl', { 'do': 'touch updated2' }
+  Plug 'junegunn/vim-pseudocl', { 'commit': 'dd507ca' }
+  Plug 'junegunn/seoul256.vim', { 'branch': 'master' }
+  Plug 'junegunn/goyo.vim', { 'tag': '1.6.0' }
+  Plug 'yous/subsubmodule'
   call plug#end()
 
   PlugUpdate
   q
   Assert !filereadable(g:plugs['vim-easy-align'].dir.'/updated2'),
     \ 'vim-easy-align/updated2 should not exist'
-  Assert !filereadable(g:plugs['vim-pseudocl'].dir.'/updated2'),
+  AssertEqual 'dd507ca0d5f3fdf0d522558cc5ecffdabf824469', GitCommit('vim-pseudocl')
-    \ 'vim-pseudocl/updated2 should not exist'
+  AssertEqual 'master', GitBranch('seoul256.vim')
+  AssertEqual '1.6.0', GitTag('goyo.vim')
 
 Execute (PlugUpdate!):
   silent PlugUpdate!
   q
   Assert filereadable(g:plugs['vim-easy-align'].dir.'/updated2'),
     \ 'vim-easy-align/updated2 should exist'
-  Assert filereadable(g:plugs['vim-pseudocl'].dir.'/updated2'),
+
-    \ 'vim-pseudocl/updated2 should exist'
+Execute (When submodules are not initialized):
+  call system(printf('cd %s && git submodule deinit subsubmodule', g:plugs['subsubmodule'].dir))
+
+^ #481 submodule update should use standard shell
+  let sh = &shell
+  set sh=/bin/echo
+  silent PlugUpdate!
+  let &shell = sh
+  unlet sh
+  q
+  AssertEqual ' ', system(printf('cd %s && git submodule status', g:plugs['subsubmodule'].dir))[0],
+    \ 'subsubmodule/subsubmodule should be initialized'
 
 Execute (Using Funcref):
   function! PlugUpdated(info)
@@ -728,7 +877,7 @@ Execute (Using Funcref):
   Plug 'junegunn/vim-pseudocl',   { 'do': function('PlugUpdated') }
   call plug#end()
 
-  call system('cd /tmp/junegunn/vim-easy-align && git commit --allow-empty -m "update"')
+  call system('cd /tmp/vim-plug-test/junegunn/vim-easy-align && git commit --allow-empty -m "update"')
   call system('cd '.g:plugs['vim-easy-align'].dir.' && git reset --hard HEAD^')
   call RmRf(g:plugs['vim-pseudocl'].dir)
 
@@ -756,18 +905,75 @@ Execute (Using Funcref):
   Assert filereadable(g:plugs['vim-pseudocl'].dir.'/vim-pseudoclunchanged13'),
     \ 'vim-pseudocl/vim-pseudoclunchanged13 should exist'
 
+Execute (Post-update hook output; success and failure):
+  call plug#begin()
+  Plug 'junegunn/vim-easy-align', { 'do': 'xxx-non-existent-command-xxx' }
+  Plug 'junegunn/vim-pseudocl',   { 'do': 'true' }
+  call plug#end()
+
+  silent PlugInstall! 1
+  AssertEqual '- Post-update hook for vim-pseudocl ... OK', getline(5)
+  AssertEqual 'x Post-update hook for vim-easy-align ... Exit status: 127', getline(6)
+  q
+
+Execute (Post-update hook output; invalid type or funcref):
+  call plug#begin()
+  Plug 'junegunn/vim-easy-align', { 'do': 1 }
+  Plug 'junegunn/vim-pseudocl',   { 'do': function('call') }
+  call plug#end()
+
+  silent PlugInstall! 1
+  AssertEqual 'x Post-update hook for vim-pseudocl ... Vim(call):E119: Not enough arguments for function: call', getline(5)
+  AssertEqual 'x Post-update hook for vim-easy-align ... Invalid hook type', getline(6)
+  q
+
+Execute (Should not run when failed to update):
+  call plug#begin()
+  Plug 'junegunn/vim-easy-align', { 'do': 'touch failed'     }
+  Plug 'junegunn/vim-pseudocl',   { 'do': 'touch not-failed' }
+  call plug#end()
+
+  " Invalid remote URL
+  call system(printf('cd %s && git remote set-url origin xxx', g:plugs['vim-easy-align'].dir))
+
+  " New commits on remote
+  call system('cd /tmp/vim-plug-test/junegunn/vim-easy-align && git commit --allow-empty -m "update"')
+  call system('cd /tmp/vim-plug-test/junegunn/vim-pseudocl && git commit --allow-empty -m "update"')
+
+  silent PlugUpdate
+  Log getline(1, '$')
+  q
+
+  Assert !filereadable(g:plugs['vim-easy-align'].dir.'/failed'),
+    \ 'vim-easy-align/failed should not exist'
+  Assert filereadable(g:plugs['vim-pseudocl'].dir.'/not-failed'),
+    \ 'vim-pseudocl/not-failed should exist'
+
+Execute (Vim command with : prefix):
+  call plug#begin()
+  Plug 'junegunn/vim-pseudocl', { 'do': ':call setline(2, 12345)' }
+  call plug#end()
+
+  PlugInstall!
+  Log getline(1, '$')
+  AssertEqual '12345', getline(2)
+  q
+
 **********************************************************************
 ~ Overriding `dir`
 **********************************************************************
 
 Execute (Using custom dir):
+  call plug#begin()
+  Plug 'junegunn/vim-easy-align'
+  call plug#end()
   Assert isdirectory(g:plugs['vim-easy-align'].dir)
 
-  call RmRf('/tmp/easy-align')
+  call RmRf('/tmp/vim-plug-test/easy-align')
   call plug#begin()
-  Plug 'junegunn/vim-easy-align', { 'dir': '/tmp/easy-align' }
+  Plug 'junegunn/vim-easy-align', { 'dir': '/tmp/vim-plug-test/easy-align' }
   call plug#end()
-  AssertEqual '/tmp/easy-align/', g:plugs['vim-easy-align'].dir
+  AssertEqual '/tmp/vim-plug-test/easy-align/', g:plugs['vim-easy-align'].dir
 
   PlugClean!
   Assert !isdirectory(g:plugs['vim-easy-align'].dir)
@@ -818,12 +1024,17 @@ Execute (Filetype-based on-demand loading):
   call ReloadPlug()
   call plug#begin()
   Plug '$PLUG_FIXTURES/xxx', { 'for': 'xxx' }
+  Plug '$PLUG_FIXTURES/yyy', { 'for': 'yyy' }
   call plug#end()
 
   AssertEqual ['xxx/ftdetect', 'xxx/after/ftdetect'], g:xxx
 
   setf xxx
-  AssertEqual ['xxx/ftdetect', 'xxx/after/ftdetect', 'xxx/plugin', 'xxx/after/plugin', 'xxx/ftplugin', 'xxx/after/ftplugin', 'xxx/indent', 'xxx/after/indent', 'xxx/syntax', 'xxx/after/syntax'], g:xxx
+  AssertEqual ['xxx/ftdetect', 'xxx/after/ftdetect', 'xxx/plugin', 'xxx/after/plugin', 'xxx/syntax', 'xxx/after/syntax', 'xxx/ftplugin', 'xxx/after/ftplugin', 'xxx/indent', 'xxx/after/indent'], g:xxx
+
+  " syntax/xxx.vim and after/syntax/xxx.vim should not be loaded (#410)
+  setf yyy
+  AssertEqual ['yyy/ftdetect', 'yyy/after/ftdetect', 'yyy/plugin', 'yyy/after/plugin'], g:yyy
 
 Before:
 
@@ -875,6 +1086,8 @@ Execute (PlugStatus should not contain (not loaded)):
   q
 
 Execute (Load plugin from PlugStatus screen with L key in normal mode):
+  call ResetPlug()
+  unlet! g:yyy
   call plug#begin()
   Plug '$PLUG_FIXTURES/yyy', { 'on': [] }
   call plug#end()
@@ -1076,11 +1289,11 @@ Execute (PlugClean should not try to remove unmanaged plugins inside g:plug_home
 
   " Remove z1, z2
   PlugClean!
-  AssertExpect '^- ', 2
+  AssertExpect '^\~ ', 2
   AssertExpect 'Already clean', 0
 
   PlugClean!
-  AssertExpect '^- ', 0
+  AssertExpect '^\~ ', 0
   AssertExpect 'Already clean', 1
   q
 
@@ -1096,17 +1309,22 @@ Execute (PlugSnapshot / #154 issues with paths containing spaces):
   PlugInstall
   call plug#load('vim-easy-align') " Should properly handle paths with spaces
   PlugSnapshot
-  AssertEqual '#!/bin/sh', getline(1)
+  AssertEqual '" Generated by vim-plug', getline(1)
-  AssertEqual '# Generated by vim-plug', getline(2)
+  AssertEqual 0, stridx(getline(6), "silent! let g:plugs['seoul256.vim'].commit = '")
-  AssertEqual 'vim +PlugUpdate +qa', getline(5)
+  AssertEqual 0, stridx(getline(7), "silent! let g:plugs['vim-easy-align'].commit = '")
-  AssertEqual 'PLUG_HOME=$TMPDIR/plug\ with\ spaces', getline(7)
+  AssertEqual 'vim', &filetype
-  AssertEqual 0, stridx(getline(9), 'cd $PLUG_HOME/seoul256.vim/ && git reset --hard')
-  AssertEqual 0, stridx(getline(10), 'cd $PLUG_HOME/vim-easy-align/ && git reset --hard')
-  AssertEqual 'sh', &filetype
 
-  execute 'PlugSnapshot' g:plug_home.'/snapshot.sh'
+  call delete(g:plug_home.'/snapshot.vim')
-  AssertEqual 'sh', &filetype
+  execute 'PlugSnapshot' escape(g:plug_home.'/snapshot.vim', ' ')
-  AssertEqual 'snapshot.sh', fnamemodify(expand('%'), ':t')
+  AssertEqual 'vim', &filetype
+  AssertEqual 'snapshot.vim', fnamemodify(expand('%'), ':t')
+  q
+
+Execute(PlugSnapshot! to overwrite existing file):
+  call writefile(['foobar'], g:plug_home.'/snapshot.vim')
+  AssertEqual 'foobar', readfile(g:plug_home.'/snapshot.vim')[0]
+  execute 'PlugSnapshot!' escape(g:plug_home.'/snapshot.vim', ' ')
+  AssertEqual '" Generated by vim-plug', readfile(g:plug_home.'/snapshot.vim')[0]
   q
 
 **********************************************************************
@@ -1166,3 +1384,90 @@ Execute (#221 Shallow-clone disabled by tag):
   Assert !filereadable('.git/shallow')
   cd -
 
+Execute (Commit hash support):
+  " Get goyo back to master
+  call plug#begin(g:temp_plugged)
+  Plug 'junegunn/goyo.vim'
+  call plug#end()
+  PlugUpdate
+
+  call plug#begin(g:temp_plugged)
+  Plug 'junegunn/goyo.vim',  { 'commit': 'ffffffff' }
+  Plug 'junegunn/vim-emoji', { 'commit': '9db7fcfee0d90dafdbcb7a32090c0a9085eb054a' }
+  call plug#end()
+  PlugUpdate
+  Log getline(1, '$')
+  AssertEqual 'x goyo.vim: error: pathspec ''ffffffff'' did not match any file(s) known to git.', getline(5)
+  AssertEqual 0, stridx(getline(6), '- vim-emoji: HEAD is now at 9db7fcf...')
+
+  let hash = system(printf('cd %s && git rev-parse HEAD', g:plugs['vim-emoji'].dir))[:-2]
+  AssertEqual '9db7fcfee0d90dafdbcb7a32090c0a9085eb054a', hash
+
+  " Validate error formatting
+  PlugStatus
+  Log getline(1, '$')
+  AssertEqual ['Finished. 1 error(s).',
+              \'[==]',
+              \'',
+              \'x goyo.vim:'], getline(1, 4)
+  Assert getline(5) =~ '    Invalid HEAD (expected: fffffff, actual: [0-9a-f]\{7})'
+  AssertEqual ['    PlugUpdate required.',
+              \'- vim-emoji: OK'], getline(6, '$')
+
+  " PlugDiff should show pending updates for vim-emoji
+  PlugDiff
+  Log getline(1, '$')
+  AssertEqual '0 plugin(s) updated. 1 plugin(s) have pending updates.', getline(1)
+  Assert !empty(mapcheck('o'))
+  Assert empty(mapcheck('X'))
+  Assert !empty(mapcheck("\<cr>"))
+
+  " Nor in PlugSnapshot output
+  PlugSnapshot
+  Log getline(1, '$')
+  AssertEqual 8, line('$')
+  q
+
+Execute (Commit hash support - cleared):
+  call plug#begin(g:temp_plugged)
+  Plug 'junegunn/goyo.vim'
+  Plug 'junegunn/vim-emoji'
+  call plug#end()
+
+  PlugInstall
+  let hash = system(printf('cd %s && git rev-parse HEAD', g:plugs['vim-emoji'].dir))[:-2]
+  AssertEqual '9db7fcfee0d90dafdbcb7a32090c0a9085eb054a', hash
+
+  PlugUpdate
+  let hash = system(printf('cd %s && git rev-parse HEAD', g:plugs['vim-emoji'].dir))[:-2]
+  AssertNotEqual '9db7fcfee0d90dafdbcb7a32090c0a9085eb054a', hash
+  q
+
+Execute (#371 - 'as' option):
+  call plug#begin()
+  Plug 'jg/goyo.vim'
+  Plug 'junegunn/goyo.vim', {'as': 'yogo'}
+  call plug#end()
+  AssertEqual ['goyo.vim', 'yogo'], sort(keys(g:plugs))
+  Log g:plugs
+  Assert g:plugs.yogo.dir =~# '/yogo/$'
+
+  call plug#begin()
+  Plug 'junegunn/goyo.vim', {'as': 'yogo', 'dir': '/tmp/vim-plug-test/gogo'}
+  call plug#end()
+  AssertEqual ['yogo'], sort(keys(g:plugs))
+  AssertEqual '/tmp/vim-plug-test/gogo/', g:plugs.yogo.dir
+
+Execute (#427 - Tag option with wildcard (requires git 1.9.2 or above)):
+  if str2nr(split(split(system('git --version'))[-1], '\.')[0]) < 2
+    Log 'tag with wildcard requires git 1.9.2 or above'
+  else
+    call plug#begin()
+    Plug 'junegunn/vim-easy-align', { 'tag': '2.9.*' }
+    call plug#end()
+    PlugInstall!
+    Log getline(1, '$')
+    AssertExpect! '- Latest tag for 2.9.* -> 2.9.7 (vim-easy-align)', 1
+    q
+    AssertEqual '2.9.7', GitTag('vim-easy-align')
+  endif