From 61f2be7bd4167aef069ce90820080cf16519d020 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 22 May 2019 09:08:25 +0200 Subject: Fix git checkout for branches and commits Replace 'git checkout -f -B $BRANCH origin/$BRANCH && \' in all Dockerfiles that accept branch variables ($OSMO_TTCN3_BRANCH, $OSMO_MGW_BRANCH, ...) with the following: git checkout $BRANCH && \ (git symbolic-ref -q HEAD && git reset --hard origin/$BRANCH || exit 1); \ This allows using branch names and commit hashes in the $BRANCH variables. Using commits is needed for the bisect script added in [1]. The second line ("(git symbolic...") checks if we are in detached HEAD state after the checkout, and if we are not, pulls in all new commits from origin/$BRANCH. Note that it ends in ';' instead of '&&', because the command in the next line should be executed even if "git symbolic-ref" does not exit with 0 (detached HEAD state). Here is an example, to illustrate that the new command does the right thing. Clone a repository and be 50 commits behind origin/master: $ git clone "https://git.osmocom.org/osmo-mgw" $ cd osmo-mgw $ git reset --hard origin/master~50 With BRANCH="master": $ git checkout master && \ (git symbolic-ref -q HEAD && git reset --hard origin/master || exit 1); \ echo "done" Already on 'master' ... done $ git status Your branch is up-to-date with 'origin/master'. With BRANCH="85978d": $ git checkout 85978d && \ (git symbolic-ref -q HEAD && git reset --hard origin/85978d || exit 1); \ echo "done" Note: checking out '85978d'. ... done $ git status HEAD detached at 85978dad Related previous changes: * [2] made it work for commit hashes, but broke using branch names other than master, and pulling in new commits from master * [3] made branches other than master work again, but did not fix pulling in new commits from master * [4] reverted [3] and the git checkout related part from [2] [1] Change-Id: I11f7e61a9b30d58a0fdfcaf77dde447806bf661f [2] Change-Id: If3bc5fae07cf63c4fef68306be4c4328660bc869 [3] Change-Id: I2ff745c8d19b777d876170d5717c082ceb68a1f3 [4] Change-Id: Ie6da0f9ea96f11407e38545a6b3cf22ef9cadc25 Related: OS#4015 Change-Id: I4004980baf0b7d6096702b6f3067ccbdb369a28c --- osmo-msc-master/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'osmo-msc-master/Dockerfile') diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile index c8cfd62..21c7eda 100644 --- a/osmo-msc-master/Dockerfile +++ b/osmo-msc-master/Dockerfile @@ -37,7 +37,8 @@ RUN git clone git://git.osmocom.org/osmo-msc.git ADD http://git.osmocom.org/osmo-msc/patch?h=$OSMO_MSC_BRANCH /tmp/commit-osmo-msc RUN cd osmo-msc && \ - git fetch && git checkout -f -B $OSMO_MSC_BRANCH $OSMO_MSC_BRANCH && \ + git fetch && git checkout $OSMO_MSC_BRANCH && \ + (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_MSC_BRANCH || exit 1); \ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure --enable-smpp --enable-iu && \ -- cgit v1.2.3