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 /gr-gsm-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 'gr-gsm-master')
-rw-r--r-- | gr-gsm-master/Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-gsm-master/Dockerfile b/gr-gsm-master/Dockerfile index b678dd6..03cf427 100644 --- a/gr-gsm-master/Dockerfile +++ b/gr-gsm-master/Dockerfile @@ -50,7 +50,7 @@ RUN git clone git://git.osmocom.org/libosmocore ADD http://git.osmocom.org/libosmocore/patch?h=$LIBOSMOCORE_BRANCH /tmp/commit-libosmocore RUN cd libosmocore \ - && git fetch && git checkout -f $LIBOSMOCORE_BRANCH \ + && git fetch && git checkout -f -B $LIBOSMOCORE_BRANCH origin/$LIBOSMOCORE_BRANCH \ && git rev-parse --abbrev-ref HEAD && git rev-parse HEAD \ && autoreconf -fi \ && ./configure \ @@ -65,7 +65,7 @@ RUN git clone git://git.osmocom.org/gr-gsm ADD http://git.osmocom.org/gr-gsm/patch?h=$GR_GSM_BRANCH /tmp/commit-gr-gsm RUN cd gr-gsm \ - && git fetch && git checkout -f $GR_GSM_BRANCH \ + && git fetch && git checkout -f -B $GR_GSM_BRANCH origin/$GR_GSM_BRANCH \ && git rev-parse HEAD \ && mkdir build/ \ && cd build/ \ |