File tree Expand file tree Collapse file tree 1 file changed +10
-9
lines changed Expand file tree Collapse file tree 1 file changed +10
-9
lines changed Original file line number Diff line number Diff line change @@ -14,21 +14,22 @@ while getopts "?" opt; do
14
14
case $opt in
15
15
? )
16
16
echo " Usage: $0 [N]"
17
- echo " TRAVIS_COMMIT_RANGE ='<commit range>' $0 "
17
+ echo " COMMIT_RANGE ='<commit range>' $0 "
18
18
echo " $0 -?"
19
19
echo " Checks unmerged commits, the previous N commits, or a commit range."
20
- echo " TRAVIS_COMMIT_RANGE ='47ba2c3...ee50c9e' $0 "
20
+ echo " COMMIT_RANGE ='47ba2c3...ee50c9e' $0 "
21
21
exit ${EXIT_CODE}
22
22
;;
23
23
esac
24
24
done
25
25
26
- if [ -z " ${TRAVIS_COMMIT_RANGE} " ]; then
27
- if [ -n " $1 " ]; then
28
- TRAVIS_COMMIT_RANGE=" HEAD~$1 ...HEAD"
29
- else
30
- TRAVIS_COMMIT_RANGE=" origin/master..HEAD"
31
- fi
26
+ if [ -z " ${COMMIT_RANGE} " ]; then
27
+ if [ -n " $1 " ]; then
28
+ COMMIT_RANGE=" HEAD~$1 ...HEAD"
29
+ else
30
+ MERGE_BASE=$( git merge-base HEAD master)
31
+ COMMIT_RANGE=" $MERGE_BASE ..HEAD"
32
+ fi
32
33
fi
33
34
34
35
while IFS= read -r commit_hash || [[ -n " $commit_hash " ]]; do
@@ -41,6 +42,6 @@ while IFS= read -r commit_hash || [[ -n "$commit_hash" ]]; do
41
42
EXIT_CODE=1
42
43
fi
43
44
done < <( git log --format=%B -n 1 " $commit_hash " )
44
- done < <( git log " ${TRAVIS_COMMIT_RANGE } " --format=%H)
45
+ done < <( git log " ${COMMIT_RANGE } " --format=%H)
45
46
46
47
exit ${EXIT_CODE}
You can’t perform that action at this time.
0 commit comments