vim-patch.sh: use --ff with git-pull

I have `merge.ff = no` in my Git config to not use fast-forward merges
by default, but when updating the Vim sources it should not cause a
merge commit.

[ci skip]
This commit is contained in:
Daniel Hahler 2018-09-30 21:05:26 +02:00
parent 3bdc34d065
commit c2f337ce97

View File

@ -93,7 +93,7 @@ get_vim_sources() {
exit 1
fi
echo "Updating Vim sources: ${VIM_SOURCE_DIR}"
git pull &&
git pull --ff &&
msg_ok "Updated Vim sources." ||
msg_err "Could not update Vim sources; ignoring error."
fi