mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-08 10:26:16 +01:00
00bfb3ab44
This was mostly machine generated with the following command:
```
codespell \
--builtin clear,rare,usage \
--skip './po/*' --skip './.git/*' --skip './NEWS*' \
--write-changes .
```
using the latest git version of `codespell` as per [these
instructions](https://github.com/codespell-project/codespell#user-content-updating).
Then I manually checked each change using `git add -p`, made a few
manual fixups and dropped a load of incorrect changes.
There are still some outdated or loaded terms used in GLib, mostly to do
with git branch terminology. They will need to be changed later as part
of a wider migration of git terminology.
If I’ve missed anything, please file an issue!
Signed-off-by: Philip Withnall <withnall@endlessm.com>
41 lines
2.1 KiB
Bash
Executable File
41 lines
2.1 KiB
Bash
Executable File
#!/bin/bash
|
||
|
||
set -e
|
||
|
||
# Wrap everything in a subshell so we can propagate the exit status.
|
||
(
|
||
|
||
# We need to add a new remote for the upstream target branch, since this script
|
||
# could be running in a personal fork of the repository which has out of date
|
||
# branches.
|
||
git remote add upstream https://gitlab.gnome.org/GNOME/glib.git
|
||
git fetch upstream
|
||
|
||
# Work out the newest common ancestor between the detached HEAD that this CI job
|
||
# has checked out, and the upstream target branch (which will typically be
|
||
# `upstream/master` or `upstream/glib-2-62`).
|
||
# `${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}` is only defined if we’re running in
|
||
# a merge request pipeline; fall back to `${CI_DEFAULT_BRANCH}` otherwise.
|
||
newest_common_ancestor_sha=$(diff --old-line-format='' --new-line-format='' <(git rev-list --first-parent "upstream/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_DEFAULT_BRANCH}}") <(git rev-list --first-parent HEAD) | head -1)
|
||
git diff -U0 --no-color "${newest_common_ancestor_sha}" | ./clang-format-diff.py -binary "clang-format-7" -p1
|
||
|
||
)
|
||
exit_status=$?
|
||
|
||
# The style check is not infallible. The clang-format configuration cannot
|
||
# perfectly describe GLib’s coding style: in particular, it cannot align
|
||
# function arguments. The documented coding style for GLib takes priority over
|
||
# clang-format suggestions. Hopefully we can eventually improve clang-format to
|
||
# be configurable enough for our coding style. That’s why this CI check is OK
|
||
# to fail: the idea is that people can look through the output and ignore it if
|
||
# it’s wrong. (That situation can also happen if someone touches pre-existing
|
||
# badly formatted code and it doesn’t make sense to tidy up the wider coding
|
||
# style with the changes they’re making.)
|
||
echo ""
|
||
echo "Note that clang-format output is advisory and cannot always match the GLib coding style, documented at"
|
||
echo " https://gitlab.gnome.org/GNOME/gtk/blob/master/docs/CODING-STYLE"
|
||
echo "Warnings from this tool can be ignored in favour of the documented coding style,"
|
||
echo "or in favour of matching the style of existing surrounding code."
|
||
|
||
exit ${exit_status}
|