From 82b09bc9d21e4b5c50105fac558da84af43e3470 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 26 Jan 2020 15:21:33 +0100 Subject: scripts/vim-patch.sh: include --shortstat with -m --- scripts/vim-patch.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'scripts/vim-patch.sh') diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index 03f52bd162..fe6dcc1147 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -598,7 +598,9 @@ list_missing_previous_vimpatches_for_patch() { local -a missing_unique while IFS= read -r line; do - missing_unique+=("$line") + local commit="${line%%:*}" + local stat="$(git -C "${VIM_SOURCE_DIR}" show --format= --shortstat "${commit}")" + missing_unique+=("$(printf '%s\n %s' "$line" "$stat")") done < <(printf '%s\n' "${missing_list[@]}" | sort -u) msg_err "$(printf '%d missing previous Vim patches:' ${#missing_unique[@]})" -- cgit From 074745d9242acb6bba7252b13691afbe85439372 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Thu, 15 Oct 2020 21:52:44 -0400 Subject: Fix shellcheck error SC2155 Close https://github.com/neovim/neovim/pull/11765 --- scripts/vim-patch.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scripts/vim-patch.sh') diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index fe6dcc1147..8287958ab5 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -597,9 +597,10 @@ list_missing_previous_vimpatches_for_patch() { set -u local -a missing_unique + local stat while IFS= read -r line; do local commit="${line%%:*}" - local stat="$(git -C "${VIM_SOURCE_DIR}" show --format= --shortstat "${commit}")" + stat="$(git -C "${VIM_SOURCE_DIR}" show --format= --shortstat "${commit}")" missing_unique+=("$(printf '%s\n %s' "$line" "$stat")") done < <(printf '%s\n' "${missing_list[@]}" | sort -u) -- cgit