mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-25 20:07:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch.sh: ignore coloring and pagers (#5030)

Browse Source
This commit is contained in:
Simon Weil
2016-07-10 22:21:45 +03:00
committed by Justin M. Keyes
parent b771ec8baa
commit 29060a592c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/vim-patch.sh
View File

@@ -137,7 +137,7 @@ get_vim_patch() {
# Patch surgery: preprocess the patch. # Patch surgery: preprocess the patch.
# - transform src/ paths to src/nvim/ # - transform src/ paths to src/nvim/
local vim_full 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')" | LC_ALL=C sed -e 's/\( [ab]\/src\)/\1\/nvim/g')"
local neovim_branch="${BRANCH_PREFIX}${vim_version}" 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" | 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")" grep -x -e "[[:space:]]*//[[:space:]]${patch_number} NA.*" -e "[[:space:]]*${patch_number}," >/dev/null && echo "false" || echo "true")"
vim_commit="${vim_tag#v}" 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)" vim_commit="${vim_commit} (+runtime)"
fi fi
else else