diff options
| author | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2026-08-18 21:36:27 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2026-08-18 21:40:04 -0400 |
| commit | a98858651ee5abd2bc68226c8d0ad49fef324f04 (patch) | |
| tree | 1cd58c9e0bf5ece5d458ce1c998ed42f1526cf17 /scripts/vim-patch.sh | |
| parent | 53211ade2baba5841050daa50b1c38fedaffdda0 (diff) | |
| download | rneovim-a98858651ee5abd2bc68226c8d0ad49fef324f04.tar.gz rneovim-a98858651ee5abd2bc68226c8d0ad49fef324f04.tar.bz2 rneovim-a98858651ee5abd2bc68226c8d0ad49fef324f04.zip | |
build(vim-patch): n/a docs from 9.0.1481, keep hunks without header
switch/case and goto labels v9.0.1481 and similar patches
from auto-N/A.
Blacklist as much as possible to auto-N/A later crypt patches.
Hunks without header in "*.h" is valid if only littered with #ifdefs
or change is isolated to 1st line
but "src/feature.h" should be mostly N/A
after Nvim removed "FEAT_" guards.
Wonder if certain patches with only "*.h" changes were mistakenly
marked N/A.
Diffstat (limited to 'scripts/vim-patch.sh')
| -rwxr-xr-x | scripts/vim-patch.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index e22e4701b0..765adc2b64 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -942,7 +942,7 @@ is_na_patch() { grep -Pzo '(?<=\n)@@ -[0-9][^@\n]+\+[0-9][^@\n]* @@[^@\n]*\n(?=([-+][^\n]*\n)+(@|$))' | tr '\0' '\n') if test -n "$HUNKS"; then - HUNK_NUM_FINAL=$(echo "$HUNKS" | sed 's/^@@ .* @@ \?//' | grep -cv -f "$NA_HUNKS_VIM") + HUNK_NUM_FINAL=$(echo "$HUNKS" | sed 's/^@@ .* @@ //' | grep -cv -f "$NA_HUNKS_VIM") test "$HUNK_NUM_FINAL" -ne 0 && return 1 fi ;; @@ -1000,7 +1000,7 @@ is_na_patch() { "$patch" -- "${file}" | grep '^@@ .* @@') if test -n "$HUNKS"; then - HUNK_NUM_FINAL=$(echo "$HUNKS" | sed 's/^@@ .* @@ \?//' | grep -cv -f "$NA_HUNKS_H") + HUNK_NUM_FINAL=$(echo "$HUNKS" | sed 's/^@@ .* @@ //' | grep -cv -f "$NA_HUNKS_H") test "$HUNK_NUM_FINAL" -ne 0 && return 1 fi ;; @@ -1019,16 +1019,18 @@ is_na_patch() { '-I^\s*(static)?\s(char_u|hashtab_T|int|void)( \*)?$' \ '-I^static\s(char_u|hashtab_T|int|void)\s\*?[^*]+\(.+\);$' \ '-I#\s*define.*ex_ni$' \ + '-I[.>]b_p_key' \ '-I[_.>]sc_version = ' \ '-I[_.>]uf_script_ctx_version = ' \ '-I = skip_type\(.+\);$' \ '-Icheck_typval_type\(.+\)' \ + '-Icrypt_get_method_nr\(.+\)' \ '-I\spopup_set_firstline\(.+\);' \ '-I\svim_free\(.*w_popup_title\);' \ "$patch" -- "${file}" | grep '^@@ .* @@') if test -n "$HUNKS"; then - HUNK_NUM_FINAL=$(echo "$HUNKS" | sed 's/^@@ .* @@ \?//' | grep -cv -f "$NA_HUNKS_C") + HUNK_NUM_FINAL=$(echo "$HUNKS" | sed 's/^@@ .* @@ //' | grep -cv -f "$NA_HUNKS_C") test "$HUNK_NUM_FINAL" -ne 0 && return 1 fi ;; |