diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-07-16 08:22:49 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-07-16 08:22:49 +0800 |
| commit | cb95f71f71f665b21848cf25780d83278cd1dcf0 (patch) | |
| tree | 4ebdf96b731ae839f8beb326e36dcb0b429bc453 /scripts | |
| parent | 8cc49f9f1ad4edface62284c32f05ef1140d8220 (diff) | |
| parent | 4dee942e732d41ad62b732c0a39719d9405bc928 (diff) | |
| download | rneovim-cb95f71f71f665b21848cf25780d83278cd1dcf0.tar.gz rneovim-cb95f71f71f665b21848cf25780d83278cd1dcf0.tar.bz2 rneovim-cb95f71f71f665b21848cf25780d83278cd1dcf0.zip | |
merge upstream/master
Diffstat (limited to 'scripts')
| -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")" |