From a7ec1a5f502e290f1e7d655ac225219c4d2c510e Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Thu, 27 Aug 2015 23:44:48 -0400 Subject: vim-patch.sh: best-effort for older git. --- scripts/vim-patch.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'scripts/vim-patch.sh') diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index 73cba243f7..a1b58c7c91 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -168,9 +168,16 @@ list_vim_patches() { local vim_tags=$(cd "${VIM_SOURCE_DIR}" && \ git tag --contains v7.4.442) - # Get "runtime update" commits since e2719096. - local vim_runtime_commits=$(cd "${VIM_SOURCE_DIR}" && \ - git log --format='%H' --grep='^patch' --grep='^updated for version' --invert-grep e2719096250a19ecdd9a35d13702879f163d2a50..HEAD) + # Get non-versioned commits since e2719096. + if git log -1 --grep='.' --invert-grep > /dev/null 2>&1 ; then + local vim_runtime_commits=$(cd "${VIM_SOURCE_DIR}" && \ + git log --format='%H' --grep='^patch' --grep='^updated for version' --invert-grep e2719096250a19ecdd9a35d13702879f163d2a50..HEAD) + else + # --invert-grep 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}" && \ + git log --format='%H' --grep='Updated' e2719096250a19ecdd9a35d13702879f163d2a50..HEAD) + fi local vim_commit for vim_commit in ${vim_tags} ${vim_runtime_commits}; do -- cgit