| commit | 23bd427ca3019d521daf6d4759c07fa8c769ca6d | [log] [tgz] |
|---|---|---|
| author | Benoit Tellier <btellier@linagora.com> | Thu Oct 18 11:54:10 2018 +0700 |
| committer | Benoit Tellier <btellier@linagora.com> | Fri Oct 19 16:23:28 2018 +0700 |
| tree | a0d298e09a18c7cdc207d16fc4a4cd3bfa552792 | |
| parent | cdf0bd4c04e7b97d2624c12cad1838308e353095 [diff] |
JAMES-2559 Explicitly specify SHA1 belongs to origin
diff --git a/dockerfiles/merge/merge.sh b/dockerfiles/merge/merge.sh index a589cb9..25e063d 100755 --- a/dockerfiles/merge/merge.sh +++ b/dockerfiles/merge/merge.sh
@@ -31,6 +31,8 @@ # Getting the branch to be merged from /origin git fetch origin +# This is required for non master branches but fails for SHA-1 +git checkout origin/$SHA1 -b $SHA1 || true git checkout $SHA1 git checkout -b SHA1_BRANCH