Skip to content

Commit 3537c25

Browse files
committed
fix(resolve): ignore space errs
1 parent 8fb2d41 commit 3537c25

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

bin/git-resolve

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ git diff --name-only --diff-filter=U --relative -z |
99
# `--quiet` implies `--exit-code` which is incompatible with `--check`;
1010
# however, it could be special-cased internally, so it could work
1111
# (untested)
12-
if ! git diff --check -- "$f" &>/dev/null; then
12+
if ! git -c core.whitespace='' diff --check -- "$f" &>/dev/null; then
1313
printf '%s\0' "$f"
1414
fi
1515
done |
@@ -23,7 +23,7 @@ git diff --name-only --diff-filter=U -z |
2323
while IFS= read -r -d '' f; do
2424
# WARN: `f` is relative to repo root!
2525
# this might be broken
26-
if git diff --check -- "$f"; then
26+
if git -c core.whitespace='' diff --check -- "$f"; then
2727
git add -- "$f"
2828
fi
2929
done

0 commit comments

Comments
 (0)