Junio C Hamano <gitster@xxxxxxxxx> writes: [snip] >> diff --git a/ci/run-style-check.sh b/ci/run-style-check.sh >> new file mode 100755 >> index 0000000000..9d4c4089c1 >> --- /dev/null >> +++ b/ci/run-style-check.sh >> @@ -0,0 +1,8 @@ >> +#!/usr/bin/env sh > > Under ci/ hierarchy we are very inconsistent. Most use the bog > standard "#!/bin/sh" (which is my preference by the way), but > see what we have here right now: > > $ git grep -e '^#![a-z/]*/bin/[a-z]*sh' -e '^#![a-z/]*bin/env ' ci | > sort -t: -k2 > ci/check-directional-formatting.bash:#!/bin/bash > ci/install-dependencies.sh:#!/bin/sh > ci/make-test-artifacts.sh:#!/bin/sh > ci/mount-fileshare.sh:#!/bin/sh > ci/print-test-failures.sh:#!/bin/sh > ci/run-build-and-minimal-fuzzers.sh:#!/bin/sh > ci/run-build-and-tests.sh:#!/bin/sh > ci/run-docker-build.sh:#!/bin/sh > ci/run-docker.sh:#!/bin/sh > ci/run-static-analysis.sh:#!/bin/sh > ci/run-test-slice.sh:#!/bin/sh > ci/util/extract-trash-dirs.sh:#!/bin/sh > ci/check-whitespace.sh:#!/usr/bin/env bash > ci/test-documentation.sh:#!/usr/bin/env bash > > Unless you have a strong reason to suspect that in your CI > environment /bin/sh is an unusuably broken shell, please do not > spread the inconsistencies. > > I think the consensus from the last discussion we had was to allow > scripts that rely on bash-isms to say "#!/usr/bin/env bash" because > we know /bin/sh can legitimately be not bash and we assume bash may > not be installed as /bin/bash. As all of them would run in the CI > environment that we have some control over what required packages > are installed at what path, it is OK to assume that "bash" would be > found on the $PATH by using /usr/bin/env (but it does assume > everybody installs "env" there, not /bin/env or /usr/local/bin/env, > with a bit of chicken-and-egg issue). > I must admit, I didn't put any thought into this while writing. The usage of '/usr/bin/env' is mostly muscle memory and since I didn't need any bash-isms, I defaulted to /bin/sh. I'll change it, thanks! >> +# >> +# Perform style check >> +# >> + >> +baseCommit=$1 >> + >> +git clang-format --style file --diff --extensions c,h "$baseCommit" > > OK, "git clang-format" compares the working tree with the named > commit, so if we have the tip of the topic branch proposed to be > merged checked out and compare it with the base commit of the topic, > that would give us exactly what we want. Nice. > > Thanks.
Attachment:
signature.asc
Description: PGP signature
