mirror of
https://github.com/neovim/neovim.git
synced 2025-10-21 01:02:09 +00:00
vim-patch.sh: Unwrap commit messages when reviewing PRs
Longer summary lines for commits may be wrapped when downloading the commit from GitHub. Unwrapping the lines ensures they can be compared with the raw Vim commits. The difference before and after this patch using: ./scripts/vim-patch.sh -r 8684 Before: ✘ Wrong commit message. Expected: vim-patch:8.0.1464: completing directory after :find does not add slash Problem: Completing directory after :find does not add slash. Solution: Adjust the flags for globpath(). (Genki Sky) vim/vim@8a37b03 Actual: vim-patch:8.0.1464: completing directory after :find does not add slash Problem: Completing directory after :find does not add slash. Solution: Adjust the flags for globpath(). (Genki Sky) After: ✔ Found expected commit message. [ci skip]
This commit is contained in:
@@ -449,12 +449,21 @@ review_commit() {
|
||||
if [[ "${reply}" == y ]]; then
|
||||
echo
|
||||
return
|
||||
fi
|
||||
exit 1
|
||||
fi
|
||||
|
||||
assign_commit_details "${vim_version}"
|
||||
|
||||
echo
|
||||
echo "Creating files."
|
||||
echo "${nvim_patch}" > "${NVIM_SOURCE_DIR}/n${patch_file}"
|
||||
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"
|
||||
2>/dev/null $nvim --cmd 'set dir=/tmp' +'1,/^$/g/^ /-1join' +w +q "${NVIM_SOURCE_DIR}/n${patch_file}"
|
||||
|
||||
|
||||
local expected_commit_message
|
||||
expected_commit_message="$(commit_message)"
|
||||
local message_length
|
||||
@@ -465,12 +474,6 @@ review_commit() {
|
||||
msg_ok "Found expected commit message."
|
||||
else
|
||||
msg_err "Wrong commit message."
|
||||
echo " Expected:"
|
||||
echo "${expected_commit_message}"
|
||||
echo " Actual:"
|
||||
echo "${commit_message#${git_patch_prefix}}"
|
||||
fi
|
||||
|
||||
echo " Expected:"
|
||||
echo "${expected_commit_message}"
|
||||
echo " Actual:"
|
||||
|
Reference in New Issue
Block a user