summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-08-21 23:39:06 -0400
committerJack Humbert <jack.humb@gmail.com>2017-08-21 23:39:06 -0400
commit11d27cec1e58a1873aaac2952f3fc6194195d883 (patch)
tree99fa9578a0e9e5ff55e33bfebd7d7684043e0800
parent7a445d9167328df367c255ec3c64010fb040f298 (diff)
attempt to fix line-ending travis stuff
-rw-r--r--util/travis_compiled_push.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index 833fa8e465..3d799c9ca6 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 ()
{