From 11d27cec1e58a1873aaac2952f3fc6194195d883 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Mon, 21 Aug 2017 23:39:06 -0400 Subject: [PATCH] attempt to fix line-ending travis stuff --- util/travis_compiled_push.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index 833fa8e46..3d799c9ca 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -18,10 +18,11 @@ eval `ssh-agent -s` ssh-add id_rsa_qmk_firmware # convert to unix line-endings +git checkout master git diff --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix git diff --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add git commit -m "convert to unix line-endings [skip ci]" -git push git@github.com:qmk/qmk_firmware.git +git push git@github.com:qmk/qmk_firmware.git master increment_version () {