aboutsummaryrefslogtreecommitdiff
path: root/dev
diff options
context:
space:
mode:
authorGaëtan Gilbert2020-11-24 15:04:05 +0100
committerGaëtan Gilbert2020-11-24 15:04:25 +0100
commitc3b260cfd5e74501aa0101b9e75f050bd6a3566d (patch)
tree0e6a09b1cb560c13f0569c008c31df940885dabc /dev
parent94d579844817edcbb2454dd9dc79071b2cd1d12a (diff)
Fix linter: incorrect commit was picked in CI
The bot merge was changed some time ago.
Diffstat (limited to 'dev')
-rwxr-xr-xdev/lint-repository.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/dev/lint-repository.sh b/dev/lint-repository.sh
index 2e8a7455de..7701264ad1 100755
--- a/dev/lint-repository.sh
+++ b/dev/lint-repository.sh
@@ -9,10 +9,10 @@
CODE=0
-if [[ $(git log -n 1 --pretty='format:%s') == "Bot merge"* ]]; then
- # The FIRST parent of bot merges is from the PR, the second is
+if [[ $(git log -n 1 --pretty='format:%s') == "[CI merge]"* ]]; then
+ # The second parent of bot merges is from the PR, the first is
# current master
- head=$(git rev-parse HEAD~)
+ head=$(git rev-parse HEAD^2)
else
head=$(git rev-parse HEAD)
fi