path: root/osmo-bts-master/Dockerfile
diff options
authorOliver Smith <osmith@sysmocom.de>2019-05-07 10:01:16 +0200
committerOliver Smith <osmith@sysmocom.de>2019-05-07 10:24:52 +0200
commit26565bb729549152ce8fa89f59df02f37c907c27 (patch)
tree9be09b443e0142b7c8c6900d81b10a128e995b74 /osmo-bts-master/Dockerfile
parent269331461a2ff23a6c5e10a239075377de605aed (diff)
Simplify git checkout, allow branches and commits
Replace the following statements: a) "git checkout -f -B $BRANCH origin/$BRANCH" b) "git checkout -f -B $BRANCH $BRANCH" with: c) "git checkout -f $BRANCH" Regarding a), we don't need to specify 'origin/' for each branch, since we are cloning the repositories in the same Dockerfile, and therefore we know for sure that there is only one remote and branch names won't be ambiguous. Removing the 'origin/' allows to put commit hashes into the branch variables (like done in the new bisect script [1]). Version b) does not work with branch names: $ git checkout -f -B osmith/check-imei-before-lu osmith/check-imei-before-lu fatal: Cannot update paths and switch to branch 'osmith/check-imei-before-lu' at the same time. Did you intend to checkout 'osmith/check-imei-before-lu' which can not be resolved as commit? New version c) works with both commits and branches, and it is shorter. [1] Change-Id: I11f7e61a9b30d58a0fdfcaf77dde447806bf661f Change-Id: I2ff745c8d19b777d876170d5717c082ceb68a1f3
Diffstat (limited to 'osmo-bts-master/Dockerfile')
1 files changed, 1 insertions, 1 deletions
diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile
index f4ddf3a..d7707a3 100644
--- a/osmo-bts-master/Dockerfile
+++ b/osmo-bts-master/Dockerfile
@@ -33,7 +33,7 @@ RUN git clone git://git.osmocom.org/osmo-bts.git
ADD http://git.osmocom.org/osmo-bts/patch?h=$OSMO_BTS_BRANCH /tmp/commit-osmo-bts
RUN cd osmo-bts && \
- git fetch && git checkout -f -B $OSMO_BTS_BRANCH $OSMO_BTS_BRANCH && \
+ git fetch && git checkout -f $OSMO_BTS_BRANCH && \
git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
autoreconf -fi && \
./configure --enable-trx && \