From 97ae0ab4d8e4cdc5be2dab43e328f0a9d248b30a Mon Sep 17 00:00:00 2001 From: Sean Dewar Date: Sat, 30 Oct 2021 17:04:04 +0100 Subject: fix(vim-patch.sh): run nvim with -u NONE -n #16179 Problem: Because of -u NORC, vim-patch.sh would hang on my machine due to one of my plugins (start package) waiting for prompt input. Solution: - Use -u NONE instead to disable all plugins. - Also use -n to disable swapfiles. These changes only apply to the --headless nvim instances used to process things. --- scripts/vim-patch.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index d92480abb9..ac47f6aafd 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -183,7 +183,7 @@ assign_commit_details() { # Patch surgery preprocess_patch() { local file="$1" - local nvim="nvim -u NORC -i NONE --headless" + local nvim="nvim -u NONE -n -i NONE --headless" # Remove Filelist, README local na_files='Filelist\|README.*' @@ -683,7 +683,7 @@ review_commit() { msg_ok "Saved pull request diff to '${NVIM_SOURCE_DIR}/n${patch_file}'." CREATED_FILES+=("${NVIM_SOURCE_DIR}/n${patch_file}") - local nvim="nvim -u NORC -n -i NONE --headless" + local nvim="nvim -u NONE -n -i NONE --headless" 2>/dev/null $nvim --cmd 'set dir=/tmp' +'1,/^$/g/^ /-1join' +w +q "${NVIM_SOURCE_DIR}/n${patch_file}" local expected_commit_message -- cgit