Merge pull request #285 from priley86/travis-fix

ensure master-dist retains Travis dist file commit history

Author: dlabrecq

.travis.yml

@@ -3,7 +3,7 @@ node_js:
   - '0.10'
 
 before_install:
-  - 'git checkout -B master' # Reconcile detached HEAD
+  - 'git checkout -B $TRAVIS_BRANCH' # Reconcile detached HEAD
   - 'npm install -g bower grunt-cli'
 
 script:

scripts/publish.sh

@@ -21,9 +21,19 @@ git add dist --force
 git commit -m "Added files generated by Travis build"
 
 # Push to releases branch
+EXISTING=`git ls-remote --heads https://github.com/"$TRAVIS_REPO_SLUG".git "$TRAVIS_BRANCH"-dist`
+
 if [ -z "$TRAVIS_TAG" ]
 then
-  git push upstream $TRAVIS_BRANCH:$TRAVIS_BRANCH-dist --force -v
+  if [ -n "$EXISTING" ]
+  then
+    git fetch upstream $TRAVIS_BRANCH-dist:$TRAVIS_BRANCH-dist
+    git checkout $TRAVIS_BRANCH-dist
+    git merge -Xtheirs $TRAVIS_BRANCH --no-edit --ff
+    git push upstream $TRAVIS_BRANCH-dist --force -v
+  else
+    git push upstream $TRAVIS_BRANCH:$TRAVIS_BRANCH-dist --force -v
+  fi
 fi
 
-exit $?
+exit $?