IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch.sh: fix order of non-tagged patches

Browse Source 
Sort non-tagged patches in descending order, like tagged patches.
This commit is contained in:
Justin M. Keyes 2015-12-17 04:05:59 -05:00
parent b051f33814
commit 9d64d75031
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/vim-patch.sh
View File

@ -161,22 +161,20 @@ ${vim_diff}
list_vim_patches() { list_vim_patches() {
get_vim_sources get_vim_sources
echo printf "\nVim patches missing from Neovim:\n"
echo "Vim patches missing from Neovim:"
# Get tags since 7.4.442. # Get tags since 7.4.442.
local vim_tags=$(cd "${VIM_SOURCE_DIR}" && \ local vim_tags=$(cd "${VIM_SOURCE_DIR}" && git tag --contains v7.4.442)
git tag --contains v7.4.442)
# Get non-versioned commits since e2719096. # Get non-versioned commits since e2719096.
if git log -1 --grep='.' --invert-grep > /dev/null 2>&1 ; then if git log -1 --grep='.' --invert-grep > /dev/null 2>&1 ; then
local vim_runtime_commits=$(cd "${VIM_SOURCE_DIR}" && \ local vim_runtime_commits=$(cd "${VIM_SOURCE_DIR}" && \
git log --format='%H' --grep='^patch' --grep='^updated for version' --invert-grep e2719096250a19ecdd9a35d13702879f163d2a50..HEAD) git log --reverse --format='%H' --grep='^patch' --grep='^updated for version' \
else --invert-grep e2719096250a19ecdd9a35d13702879f163d2a50..HEAD)
# --invert-grep requires git 2.4+ else # --invert-grep requires git 2.4+
echo "Warning: some runtime updates may not be listed (requires git 2.4+)." echo "Warning: some runtime updates may not be listed (requires git 2.4+)."
local vim_runtime_commits=$(cd "${VIM_SOURCE_DIR}" && \ local vim_runtime_commits=$(cd "${VIM_SOURCE_DIR}" && \
git log --format='%H' --grep='Updated' e2719096250a19ecdd9a35d13702879f163d2a50..HEAD) git log --reverse --format='%H' --grep='Updated' e2719096250a19ecdd9a35d13702879f163d2a50..HEAD)
fi fi
local vim_commit local vim_commit
@ -191,7 +189,7 @@ list_vim_patches() {
else else
# Untagged Vim patch (e.g. runtime updates), check the Neovim git log: # Untagged Vim patch (e.g. runtime updates), check the Neovim git log:
is_missing="$(cd "${NEOVIM_SOURCE_DIR}" && is_missing="$(cd "${NEOVIM_SOURCE_DIR}" &&
git log -1 --no-merges --grep="vim\-patch:${vim_commit:0:7}" --pretty=format:"false")" git log -1 --no-merges --grep="vim\-patch:${vim_commit:0:7}" --pretty=format:false)"
fi fi
if [[ ${is_missing} != "false" ]]; then if [[ ${is_missing} != "false" ]]; then