From 412d87698fd80f8c2f9d7badfd1a308bb241eebf Mon Sep 17 00:00:00 2001 From: James McCoy Date: Thu, 15 Dec 2016 09:09:52 -0500 Subject: vim-patch: Allow skipping non-"vim-patch" commits during review It's not atypical to have extra, non-"vim-patch" commits in a PR merging a bigger or set of related patches from Vim. Rather than immediately aborting, display the patch header to the user and let them decide whether to continue reviewing. --- scripts/vim-patch.sh | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'scripts') diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index 28aa53b3c9..b5d795424b 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -366,6 +366,14 @@ review_commit() { echo "✘ Could not detect the Vim patch number." echo " This script assumes that the PR contains only commits" echo " with 'vim-patch:XXX' in their title." + echo + printf -- "$(head -n 4 <<< "${nvim_patch}")\n\n" + local reply + read -p "Continue reviewing (y/N)? " -n 1 -r reply + if [[ ! "${reply}" =~ ^[Nn]$ ]]; then + echo + return + fi exit 1 fi -- cgit