diff --git a/.ci/license-header.sh b/.ci/license-header.sh index 2253a74638..1c3863b4fe 100755 --- a/.ci/license-header.sh +++ b/.ci/license-header.sh @@ -1,15 +1,11 @@ -#!/bin/bash -e +#!/bin/sh -e HEADER="$(cat "$PWD/.ci/license/header.txt")" echo "Getting branch changes" -BRANCH=`git rev-parse --abbrev-ref HEAD` -COMMITS=`git log ${BRANCH} --not master --pretty=format:"%h"` -RANGE="${COMMITS[${#COMMITS[@]}-1]}^..${COMMITS[0]}" -FILES=`git diff-tree --no-commit-id --name-only ${RANGE} -r` - -#FILES=$(git diff --name-only master) +BASE=`git merge-base master HEAD` +FILES=`git diff --name-only $BASE` echo "Done"