utils-code/tj.git-extras
1
0
Fork 0
mirror of https://github.com/tj/git-extras.git synced 2026-09-10 07:26:17 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(resolve): ignore space errs

Browse source
This commit is contained in:
Rudxain 2026-05-17 12:36:56 -04:00 committed by Ricardo Fernández Serrata
parent 8fb2d41c90
commit 3537c25fce
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/git-resolve
View file

@ -9,7 +9,7 @@ git diff --name-only --diff-filter=U --relative -z |
# `--quiet` implies `--exit-code` which is incompatible with `--check`;
# however, it could be special-cased internally, so it could work
# (untested)
if ! git diff --check -- "$f" &>/dev/null; then
if ! git -c core.whitespace='' diff --check -- "$f" &>/dev/null; then
printf '%s\0' "$f"
fi
done |
@ -23,7 +23,7 @@ git diff --name-only --diff-filter=U -z |
while IFS= read -r -d '' f; do
# WARN: `f` is relative to repo root!
# this might be broken
if git diff --check -- "$f"; then
if git -c core.whitespace='' diff --check -- "$f"; then
git add -- "$f"
fi
done