diff options
author | Oliver Smith <osmith@sysmocom.de> | 2019-05-07 10:01:16 +0200 |
---|---|---|
committer | Oliver Smith <osmith@sysmocom.de> | 2019-05-07 10:24:52 +0200 |
commit | 26565bb729549152ce8fa89f59df02f37c907c27 (patch) | |
tree | 9be09b443e0142b7c8c6900d81b10a128e995b74 /gr-gsm-master | |
parent | 269331461a2ff23a6c5e10a239075377de605aed (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 '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 03cf427..b678dd6 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 -B $LIBOSMOCORE_BRANCH origin/$LIBOSMOCORE_BRANCH \ + && git fetch && git checkout -f $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 -B $GR_GSM_BRANCH origin/$GR_GSM_BRANCH \ + && git fetch && git checkout -f $GR_GSM_BRANCH \ && git rev-parse HEAD \ && mkdir build/ \ && cd build/ \ |