File tree Expand file tree Collapse file tree 2 files changed +2
-2
lines changed Expand file tree Collapse file tree 2 files changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -29,6 +29,7 @@ base_template: &BASE_TEMPLATE
29
29
- if [ "$CIRRUS_PR" = "" ]; then exit 0; fi
30
30
- git fetch $CIRRUS_REPO_CLONE_URL "pull/${CIRRUS_PR}/merge"
31
31
- git checkout FETCH_HEAD # Use merged changes to detect silent merge conflicts
32
+ # Also, the merge commit is used to lint COMMIT_RANGE="HEAD~..HEAD"
32
33
33
34
main_template : &MAIN_TEMPLATE
34
35
timeout_in : 120m # https://cirrus-ci.org/faq/#instance-timed-out
Original file line number Diff line number Diff line change 6
6
7
7
export LC_ALL=C
8
8
9
- GIT_HEAD=$( git rev-parse HEAD)
10
9
if [ -n " $CIRRUS_PR " ]; then
11
- COMMIT_RANGE=" ${CIRRUS_BASE_SHA} .. $GIT_HEAD "
10
+ COMMIT_RANGE=" HEAD~..HEAD "
12
11
echo
13
12
git log --no-merges --oneline " $COMMIT_RANGE "
14
13
echo
You can’t perform that action at this time.
0 commit comments