Compare commits
2 commits
0ca9d1c380
...
53441cb0fb
Author | SHA1 | Date | |
---|---|---|---|
ptrcnull | 53441cb0fb | ||
ptrcnull | 8efb7c51b1 |
4
apatch
4
apatch
|
@ -81,7 +81,7 @@ fi
|
|||
# if file exists, try to apply
|
||||
if [ -e "$patchpath" ]; then
|
||||
git apply --reject --whitespace=fix "$patchpath" || {
|
||||
rejects="$(git status --porcelain | grep '\?\? .*\.rej$' | cut -c4-)"
|
||||
rejects="$(git status --porcelain | grep -F '??' | grep -F '.rej' | cut -c4-)"
|
||||
if [ -n "$rejects" ]; then
|
||||
warning "$1 partially applied with rejects"
|
||||
for reject in $rejects; do
|
||||
|
@ -94,7 +94,7 @@ fi
|
|||
rm "$target.porig" # left by wiggle
|
||||
done
|
||||
else
|
||||
warning "$patch failed to apply"
|
||||
warning "$1 failed to apply"
|
||||
fi
|
||||
}
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue