diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-07-15 18:56:45 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-07-15 18:56:45 +0300 |
| commit | 69719e658c48bb5e95a7b57d5813ed4dc48e68e3 (patch) | |
| tree | c4f8584a7437ea6127389b26ff6876404cb58ce7 /scripts/vim-patch.sh | |
| parent | 7ab152aaa58f493e54d03a15960b8a288196e588 (diff) | |
| parent | 8898793adeb3a82fe50da4258c30940e10ebcc9d (diff) | |
| download | rneovim-69719e658c48bb5e95a7b57d5813ed4dc48e68e3.tar.gz rneovim-69719e658c48bb5e95a7b57d5813ed4dc48e68e3.tar.bz2 rneovim-69719e658c48bb5e95a7b57d5813ed4dc48e68e3.zip | |
Merge branch 'master' into colored-cmdline
Diffstat (limited to 'scripts/vim-patch.sh')
| -rwxr-xr-x | scripts/vim-patch.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index 63665b9253..37c472ce5b 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -310,7 +310,7 @@ list_vim_patches() { # Get missing Vim commits local vim_commits - vim_commits="$(cd "${VIM_SOURCE_DIR}" && git log --reverse --format='%H' v7.4.1979..HEAD)" + vim_commits="$(cd "${VIM_SOURCE_DIR}" && git log --reverse --format='%H' v8.0.0000..HEAD)" local vim_commit for vim_commit in ${vim_commits}; do @@ -320,6 +320,7 @@ list_vim_patches() { vim_tag="$(cd "${VIM_SOURCE_DIR}" && git describe --tags --exact-match "${vim_commit}" 2>/dev/null)" || true if [[ -n "${vim_tag}" ]]; then local patch_number="${vim_tag:5}" # Remove prefix like "v7.4." + patch_number="$(echo ${patch_number} | sed 's/^0*//g')" # Remove prefix "0" # Tagged Vim patch, check version.c: is_missing="$(sed -n '/static const int included_patches/,/}/p' "${NVIM_SOURCE_DIR}/src/nvim/version.c" | grep -x -e "[[:space:]]*//[[:space:]]${patch_number} NA.*" -e "[[:space:]]*${patch_number}," >/dev/null && echo "false" || echo "true")" |