commit 5cf820f384f0c20a77f43da5aa49513739bd0c3d parent dab07be4d14b3d4d94cbab2bdc29d3e6985e21f2 Author: James McCoy <jamessan@jamessan.com> Date: Thu, 27 Oct 2022 06:57:40 -0400 Merge pull request #20828 from zeertzjq/vim-patch-null build(vim-patch.sh): handle added/removed files properly Diffstat:
| M | scripts/vim-patch.sh | | | 9 | ++++----- |
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh @@ -315,12 +315,11 @@ uncrustify_patch() { local before=$patch_path/before/$basename local after=$patch_path/after/$basename local patchfile="$patch_path"/patch/"$basename".patch - if [[ ! -e $before ]] || [[ ! -e $after ]]; then - continue - fi + [[ ! -e $before ]] && before=/dev/null + [[ ! -e $after ]] && after=/dev/null git --no-pager diff --no-index --patch --unified=5 --color=never "$before" "$after" > "$patchfile" - sed -E "s|$before|/$file|g" -i "$patchfile" - sed -E "s|$after|/$file|g" -i "$patchfile" + [[ "$before" != /dev/null ]] && sed -E "s|$before|/$file|g" -i "$patchfile" + [[ "$after" != /dev/null ]] && sed -E "s|$after|/$file|g" -i "$patchfile" done cat "$patch_path"/patch/*.patch