On Tue, Dec 19, 2023 at 6:41 PM Jason Merrill <ja...@redhat.com> wrote: > > On 12/11/23 22:00, Jason Merrill wrote: > > OK for trunk? > > Ping. CCing Alex because this could plausibly be considered build > machinery, and he's had useful feedback on my sh code before.
OK in case Alex doesn't have any comments. Btw, is there a webpage where we document our git plumbing? Would be nice to update that with the new alias. Richard. > > -- 8< -- > > > > I thought it could be easier to use check_GNU_style.py. With this alias, > > 'git gcc-style' will take a git revision as argument instead of a file, or > > check HEAD if no argument is given. > > > > contrib/ChangeLog: > > > > * gcc-git-customization.sh: Add git gcc-style alias. > > --- > > contrib/gcc-git-customization.sh | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/contrib/gcc-git-customization.sh > > b/contrib/gcc-git-customization.sh > > index 2e173e859d7..54bd35ea1aa 100755 > > --- a/contrib/gcc-git-customization.sh > > +++ b/contrib/gcc-git-customization.sh > > @@ -30,6 +30,11 @@ git config alias.gcc-backport '!f() { "`git rev-parse > > --show-toplevel`/contrib/g > > git config alias.gcc-fix-changelog '!f() { "`git rev-parse > > --show-toplevel`/contrib/git-fix-changelog.py" $@; } ; f' > > git config alias.gcc-mklog '!f() { "`git rev-parse > > --show-toplevel`/contrib/mklog.py" $@; } ; f' > > git config alias.gcc-commit-mklog '!f() { "`git rev-parse > > --show-toplevel`/contrib/git-commit-mklog.py" "$@"; }; f' > > +git config alias.gcc-style '!f() { > > + check=`git rev-parse --show-toplevel`/contrib/check_GNU_style.py; > > + arg=; if [ $# -ge 1 ] && [ "$1" != "-f" ]; then arg="$1"; shift; > > + elif [ $# -eq 3 ]; then arg="$3"; set -- "$1" "$2"; fi > > + git show $arg | $check "$@" -; }; f' > > > > # Make diff on MD files use "(define" as a function marker. > > # Use this in conjunction with a .gitattributes file containing > > > > base-commit: 074c6f15f7a28c620c756f18c2a310961de00539 >