release.sh: Touch NVIM_VERSION_PATCH, show obnoxious message.

git-log-pretty-since.sh: fix bug
This commit is contained in:
Justin M. Keyes 2016-08-22 04:51:32 -04:00
parent 2f2e729899
commit 46475a1021
4 changed files with 7 additions and 3 deletions

View File

@ -111,6 +111,7 @@ Events:
Highlight groups:
|hl-EndOfBuffer|
|hl-QuickFixLine|
|hl-TermCursor|
|hl-TermCursorNC|

View File

@ -1,5 +1,5 @@
if arg[1] == '--help' then
print('Usage: genoptions.lua src/nvim runtime/syntax/vim/generated.vim')
print('Usage: lua genvimvim.lua src/nvim runtime/syntax/vim/generated.vim')
os.exit(0)
end

View File

@ -19,7 +19,7 @@ is_merge_commit() {
git log $1^2 >/dev/null 2>&1 && return 0 || return 1
}
for commit in $(git log --format='%H' --first-parent --since $__SINCE); do
for commit in $(git log --format='%H' --first-parent "$__SINCE"..HEAD); do
if is_merge_commit ${commit} ; then
if [ -z "$__INVMATCH" ] || ! git log --oneline ${commit}^1..${commit}^2 \
| grep -E "$__INVMATCH" >/dev/null 2>&1 ; then

View File

@ -52,7 +52,10 @@ git commit --edit -m "${__RELEASE_MSG} ${__CHANGELOG}"
git tag -a v"${__VERSION}" -m "NVIM v${__VERSION}"
sed -i -r 's/(NVIM_VERSION_PRERELEASE) ""/\1 "-dev"/' CMakeLists.txt
nvim -c '/NVIM_VERSION' -c 'echo "Update version numbers"' CMakeLists.txt
sed -i -r 's/set\((NVIM_VERSION_PATCH) [[:digit:]]/set(\1 ?/' CMakeLists.txt
nvim +'/NVIM_VERSION' +10new +'exe "norm! iUpdate version numbers!!!\<CR>"' \
+'norm! 10.' CMakeLists.txt
git add CMakeLists.txt
git commit -m "$__BUMP_MSG"