mirror of
https://github.com/neovim/neovim.git
synced 2026-08-26 17:11:48 +00:00
feat(vim-patch): ignore vim-patch tokens from commit list
Sort vimpatch_commit_ignore.txt based on "git log" order else "diff" fails to filter out reverted vim-patch tokens. Put latest commit to revert on top of file.
This commit is contained in:
@@ -597,15 +597,17 @@ list_vimpatch_tokens() {
|
||||
# Filter reverted Vim tokens.
|
||||
list_vimpatch_numbers() {
|
||||
local patch_pat='(8\.[12]|9\.[0-9])\.[0-9]{1,4}'
|
||||
diff "${NVIM_SOURCE_DIR}/scripts/vimpatch_token_reverts.txt" <(
|
||||
_git -C "${NVIM_SOURCE_DIR}" log --format="%s%n%b" -E --grep="^[* ]*vim-patch:${patch_pat}" |
|
||||
diff "${NVIM_SOURCE_DIR}/scripts/vimpatch_commit_ignore.txt" <(
|
||||
_git -C "${NVIM_SOURCE_DIR}" log --format="%H" -E --grep="^[* ]*vim-patch:${patch_pat}"
|
||||
) |
|
||||
grep -e '^> ' |
|
||||
sed -e 's/^> //' |
|
||||
_git -C "${NVIM_SOURCE_DIR}" log --no-walk --stdin --format="%s%n%b" |
|
||||
grep -oE "^[* ]*vim-patch:${patch_pat}" |
|
||||
sed -nEe 's/^[* ]*vim-patch:('"${patch_pat}"').*$/\1/p' |
|
||||
awk '{split($0, a, "."); printf "%d.%d.%04d\n", a[1], a[2], a[3]}' |
|
||||
sort |
|
||||
uniq ) |
|
||||
grep -e '^> ' |
|
||||
sed -e 's/^> //'
|
||||
uniq
|
||||
}
|
||||
|
||||
declare -A tokens
|
||||
|
||||
5
scripts/vimpatch_commit_ignore.txt
Normal file
5
scripts/vimpatch_commit_ignore.txt
Normal file
@@ -0,0 +1,5 @@
|
||||
bcf116cc2f2f59e6c0f5ce5a644f832476f77384
|
||||
72bc6c5801867e8f99a87737a64c1713ceac1e01
|
||||
43c137c3d8473ab87b5dad5c4c2414dd1016f663
|
||||
89a9745a1a55dc9ffd0f8292735e45bae6c7b01e
|
||||
910bbc3cca796f7fa941e0f6176cd0061de0e01c
|
||||
@@ -1,4 +0,0 @@
|
||||
8.1.2294
|
||||
9.1.0055
|
||||
9.2.0405
|
||||
9.2.1731
|
||||
Reference in New Issue
Block a user