The branch main has been updated by dteske: URL: https://cgit.FreeBSD.org/src/commit/?id=90ed365277fb9c263bed62ab466ab171e36c3586
commit 90ed365277fb9c263bed62ab466ab171e36c3586 Author: Devin Teske <[email protected]> AuthorDate: 2026-08-25 20:31:54 +0000 Commit: Devin Teske <[email protected]> CommitDate: 2026-08-25 20:31:54 +0000 git-arc: Fix inconsistent whitespace Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D59161 --- tools/tools/git/git-arc.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh index 9a557ad06f1c..edaa7a62d846 100755 --- a/tools/tools/git/git-arc.sh +++ b/tools/tools/git/git-arc.sh @@ -498,8 +498,8 @@ gitarc__diff() git write-tree ) || err "cannot apply $diff to $commit~ (rebased since last update?)" - echo "Comparing $diff against" \ - "$( git rev-parse --short "$commit" )..." >&2 + echo "Comparing $diff against" \ + "$( git rev-parse --short "$commit" )..." >&2 git diff "$rtree" "$commit" done @@ -719,7 +719,7 @@ apply_rev() # with a non-zero status and terminate the script. if $raw; then fetch -o /dev/stdout "https://reviews.freebsd.org/${rev}.diff"; | \ - git -C "$(git rev-parse --show-toplevel)" apply --index --reject + git -C "$(git rev-parse --show-toplevel)" apply --index --reject else arc patch --skip-dependencies --nobranch --nocommit --force $rev fi
