mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
Merge pull request #14538 from jamessan/vim-patch.sh-fixup
fix(vim-patch.sh -m): Show all commits touching a file, not just the first
This commit is contained in:
commit
5d9c560127
@ -578,7 +578,7 @@ list_missing_previous_vimpatches_for_patch() {
|
|||||||
local -a fnames
|
local -a fnames
|
||||||
while IFS= read -r line ; do
|
while IFS= read -r line ; do
|
||||||
fnames+=("$line")
|
fnames+=("$line")
|
||||||
done < <(git -C "${VIM_SOURCE_DIR}" diff-tree --no-commit-id --name-only -r "${vim_commit}")
|
done < <(git -C "${VIM_SOURCE_DIR}" diff-tree --no-commit-id --name-only -r "${vim_commit}" -- . ':!src/version.c')
|
||||||
local i=0
|
local i=0
|
||||||
local n=${#fnames[@]}
|
local n=${#fnames[@]}
|
||||||
printf '=== getting missing patches for %d files ===\n' "$n"
|
printf '=== getting missing patches for %d files ===\n' "$n"
|
||||||
@ -593,18 +593,20 @@ list_missing_previous_vimpatches_for_patch() {
|
|||||||
_set_missing_vimpatches 1 -- "${fname}"
|
_set_missing_vimpatches 1 -- "${fname}"
|
||||||
|
|
||||||
set +u # Avoid "unbound variable" with bash < 4.4 below.
|
set +u # Avoid "unbound variable" with bash < 4.4 below.
|
||||||
local missing_vim_commit_info="${missing_vim_patches[0]}"
|
for missing_vim_commit_info in "${missing_vim_patches[@]}"; do
|
||||||
if [[ -z "${missing_vim_commit_info}" ]]; then
|
if [[ -z "${missing_vim_commit_info}" ]]; then
|
||||||
printf -- "-\n"
|
printf -- "-\r"
|
||||||
else
|
|
||||||
local missing_vim_commit="${missing_vim_commit_info%%:*}"
|
|
||||||
if [[ -z "${vim_tag}" ]] || [[ "${missing_vim_commit}" < "${vim_tag}" ]]; then
|
|
||||||
printf -- "%s\n" "$missing_vim_commit_info"
|
|
||||||
missing_list+=("$missing_vim_commit_info")
|
|
||||||
else
|
else
|
||||||
printf -- "-\n"
|
printf -- "-\r"
|
||||||
|
local missing_vim_commit="${missing_vim_commit_info%%:*}"
|
||||||
|
if [[ -z "${vim_tag}" ]] || [[ "${missing_vim_commit}" < "${vim_tag}" ]]; then
|
||||||
|
printf -- "%s\n" "$missing_vim_commit_info"
|
||||||
|
missing_list+=("$missing_vim_commit_info")
|
||||||
|
else
|
||||||
|
printf -- "-\r"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
done
|
||||||
set -u
|
set -u
|
||||||
done
|
done
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user