Merge pull request #15767 from miri64/dist/fix/uncrustify-file
uncrustify: use unified diff to generate GH annotation
This commit is contained in:
commit
42c1070387
3
dist/tools/uncrustify/uncrustify.sh
vendored
3
dist/tools/uncrustify/uncrustify.sh
vendored
@ -57,7 +57,8 @@ exec_uncrustify () {
|
|||||||
if echo "$line" | grep -q '^--- .\+$'; then
|
if echo "$line" | grep -q '^--- .\+$'; then
|
||||||
_annotate_diff "$DIFFFILE" "$DIFFLINE" "$DIFF"
|
_annotate_diff "$DIFFFILE" "$DIFFLINE" "$DIFF"
|
||||||
DIFF="$line"
|
DIFF="$line"
|
||||||
DIFFFILE=$(echo "$line" | sed 's/^--- \(.\+\)$/\1/g')
|
DIFFFILE=$(echo "$line" |
|
||||||
|
sed 's#^--- \([ab]/\)\?\(.\+\)$#\2#g')
|
||||||
DIFFLINE=""
|
DIFFLINE=""
|
||||||
# we are in a diff currently
|
# we are in a diff currently
|
||||||
elif [ -n "$DIFF" ]; then
|
elif [ -n "$DIFF" ]; then
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user