diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/cronjob | 2 | ||||
| -rwxr-xr-x | scripts/filter.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/scripts/cronjob b/scripts/cronjob index ccdbc0607e1b..f01166b8e4e7 100755 --- a/scripts/cronjob +++ b/scripts/cronjob @@ -84,7 +84,7 @@ TESTBRANCH=test-${DATE} MERGE_OUTPUT=`( set -e git checkout -b ${TESTBRANCH} origin/master -git merge --no-edit upstream/dts +git -c merge.renameLimit=1000000 merge --no-edit upstream/dts ) 2>&1 ` REF=$(git show-ref --verify refs/heads/${TESTBRANCH}) echo "Testing: ${REF}" diff --git a/scripts/filter.sh b/scripts/filter.sh index e1f6bac29884..5e10ff417766 100755 --- a/scripts/filter.sh +++ b/scripts/filter.sh @@ -6,6 +6,8 @@ set -e export SCRIPTS=$(dirname $(readlink -f $0)) +export FILTER_BRANCH_SQUELCH_WARNING=1 + UPSTREAM_MASTER=upstream/master UPSTREAM_REWRITTEN=upstream/dts |