james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From btell...@apache.org
Subject [1/4] james-project git commit: JAMES-2559 Explicitly specify SHA1 belongs to origin
Date Fri, 19 Oct 2018 09:22:41 GMT
Repository: james-project
Updated Branches:
  refs/heads/master 2d275d119 -> 05b38b4e0


JAMES-2559 Explicitly specify SHA1 belongs to origin


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a98ac8e6
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a98ac8e6
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a98ac8e6

Branch: refs/heads/master
Commit: a98ac8e6183a1a9dbe57596c4d97328933c546aa
Parents: 2d275d1
Author: Benoit Tellier <btellier@linagora.com>
Authored: Thu Oct 18 11:54:10 2018 +0700
Committer: Benoit Tellier <btellier@linagora.com>
Committed: Fri Oct 19 16:21:48 2018 +0700

----------------------------------------------------------------------
 dockerfiles/merge/merge.sh | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/a98ac8e6/dockerfiles/merge/merge.sh
----------------------------------------------------------------------
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 @@ git checkout apache/$ORIGINAL_BRANCH -B $ORIGINAL_BRANCH
 
 # 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
 


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message