diff options
author | Harald Welte <laforge@gnumonks.org> | 2019-05-21 17:51:49 +0200 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2019-05-21 17:53:11 +0200 |
commit | 06ac6e455e0b54863972e8a7ba9707e3e56a87f2 (patch) | |
tree | 2b1656f9fe1b945568720789f86ccb766b696e03 /osmocom-bb-host-master | |
parent | 73663b01f21e9a01cf3e5048d802270c482852cf (diff) |
Revert "Simplify git checkout, allow branches and commits"
Unfortuately this commit will check out *local* master (i.e. the
previous checkout) rather than the origin/master as it's supposed to
be. This means that ever since merging this patch, our ttcn3 tests
were running some "undefined" stale versions and not current master.
This reverts commit 26565bb729549152ce8fa89f59df02f37c907c27.
Change-Id: Ie6da0f9ea96f11407e38545a6b3cf22ef9cadc25
Diffstat (limited to 'osmocom-bb-host-master')
-rw-r--r-- | osmocom-bb-host-master/Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/osmocom-bb-host-master/Dockerfile b/osmocom-bb-host-master/Dockerfile index ef6ff2d..260f381 100644 --- a/osmocom-bb-host-master/Dockerfile +++ b/osmocom-bb-host-master/Dockerfile @@ -25,7 +25,7 @@ RUN git clone git://git.osmocom.org/osmocom-bb.git ADD http://git.osmocom.org/osmocom-bb/patch?h=$OSMO_BB_BRANCH /tmp/commit RUN cd osmocom-bb && \ - git fetch && git checkout -f $OSMO_BB_BRANCH && \ + git fetch && git checkout -f -B $OSMO_BB_BRANCH origin/$OSMO_BB_BRANCH && \ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD RUN cd osmocom-bb/src/host/trxcon && \ |