diff options
| author | Simon Weil <swdevelop1981@gmail.com> | 2016-07-10 22:21:45 +0300 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-07-10 15:21:45 -0400 |
| commit | 29060a592c4c8ca4482a44b957a7bc332aed78e2 (patch) | |
| tree | 0d806310ebbca1fde259cbc8a273a9534b16cf97 | |
| parent | b771ec8baaaca8220cb3285985e4ece16c0bdcc1 (diff) | |
| download | rneovim-29060a592c4c8ca4482a44b957a7bc332aed78e2.tar.gz rneovim-29060a592c4c8ca4482a44b957a7bc332aed78e2.tar.bz2 rneovim-29060a592c4c8ca4482a44b957a7bc332aed78e2.zip | |
vim-patch.sh: ignore coloring and pagers (#5030)
| -rwxr-xr-x | scripts/vim-patch.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index a40090d4c3..3997bd52b1 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -137,7 +137,7 @@ get_vim_patch() { # Patch surgery: preprocess the patch. # - transform src/ paths to src/nvim/ local vim_full - vim_full="$(git show -1 --pretty=medium "${vim_commit}" \ + vim_full="$(git --no-pager show --color=never -1 --pretty=medium "${vim_commit}" \ | LC_ALL=C sed -e 's/\( [ab]\/src\)/\1\/nvim/g')" local neovim_branch="${BRANCH_PREFIX}${vim_version}" @@ -290,7 +290,7 @@ list_vim_patches() { is_missing="$(sed -n '/static int included_patches/,/}/p' "${NEOVIM_SOURCE_DIR}/src/nvim/version.c" | grep -x -e "[[:space:]]*//[[:space:]]${patch_number} NA.*" -e "[[:space:]]*${patch_number}," >/dev/null && echo "false" || echo "true")" vim_commit="${vim_tag#v}" - if (cd "${VIM_SOURCE_DIR}" && git show --name-only "v${vim_commit}" 2>/dev/null) | grep -q ^runtime; then + if (cd "${VIM_SOURCE_DIR}" && git --no-pager show --color=never --name-only "v${vim_commit}" 2>/dev/null) | grep -q ^runtime; then vim_commit="${vim_commit} (+runtime)" fi else |