Created
March 17, 2014 18:39
-
-
Save juampynr/9605547 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
$ git diff | |
diff --git a/prepare_dir.sh b/prepare_dir.sh | |
index 69b122d..ebb9e8c 100755 | |
--- a/prepare_dir.sh | |
+++ b/prepare_dir.sh | |
@@ -85,7 +85,7 @@ MESSAGE="Checked out a new branch for this pull request, and merged it to $MERGE | |
# If this the merge branch is not master, also merge to master to be sure all | |
# work is combined. | |
-if [[ "$MERGE_BRANCH" -ne "master" ]]; then | |
+if [ "$MERGE_BRANCH" != "master" ]; then | |
git checkout master | |
git pull | |
git merge $MERGE_BRANCH -m "Jenkins test merge into master." |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment