From f755370682ad6e82f468975b40cf734e5b5f47c9 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 26 Jan 2020 14:50:25 +0100 Subject: scripts/vim-patch.sh: add -m to usage Ref: https://github.com/neovim/neovim/pull/11514#issuecomment-569476828 --- scripts/vim-patch.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts/vim-patch.sh') diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index f9726e8a87..6c9bea2ad3 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -23,6 +23,7 @@ usage() { echo " -h Show this message and exit." echo " -l [git-log opts] List missing Vim patches." echo " -L [git-log opts] List missing Vim patches (for scripts)." + echo " -m {vim-revision} List previous (older) missing Vim patches." echo " -M List all merged patch-numbers (at current v:version)." echo " -p {vim-revision} Download and generate a Vim patch. vim-revision" echo " can be a Vim version (8.0.xxx) or a Git hash." -- cgit From 20f5f448830db553ae9b3bc4cfc1602d66b0aa3e Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 26 Jan 2020 15:07:41 +0100 Subject: set -u before return Follow up to a4d21f059. --- scripts/vim-patch.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts/vim-patch.sh') diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index 6c9bea2ad3..7eeb644318 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -582,6 +582,7 @@ list_missing_previous_vimpatches_for_patch() { set +u # Avoid "unbound variable" with bash < 4.4 below. if [[ -z "${missing_list[*]}" ]]; then msg_ok 'no missing previous Vim patches' + set -u return 0 fi set -u -- cgit From 1dc5e5ae9b3c5aa057e21df5fd9978b47ed3492e Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 26 Jan 2020 15:20:51 +0100 Subject: doc --- scripts/vim-patch.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'scripts/vim-patch.sh') diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index 7eeb644318..ecaddeacf6 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -428,7 +428,7 @@ _set_tokens_and_tags() { } # Prints a newline-delimited list of Vim commits, for use by scripts. -# "$1": use extended format? +# "$1": use extended format? (with subject) # "$@" is passed to list_vim_commits, as extra arguments to git-log. list_missing_vimpatches() { local -a missing_vim_patches=() @@ -442,6 +442,8 @@ list_missing_vimpatches() { # Sets / appends to missing_vim_patches (useful to avoid a subshell when # used multiple times to cache tokens/vim_commit_tags). +# "$1": use extended format? (with subject) +# "$@": extra arguments to git-log. _set_missing_vimpatches() { local token vim_commit vim_tag patch_number declare -a git_log_args -- cgit