[MERGED] osmo-ci[master]: osmo-deps.sh: fix: add 'origin/' to branch, to properly update

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged.

Change subject: osmo-deps.sh: fix: add 'origin/' to branch, to properly update
......................................................................


osmo-deps.sh: fix: add 'origin/' to branch, to properly update

If I have a git clone that once did 'checkout [-f] branch', and if then
origin/branch gets updates, doing another 'checkout -f branch' only goes back
to the local tracking-branch of origin/branch. We never pull in changes from
origin/branch anymore as soon as a local branch exists. Always prepend
'origin/', so that 'checkout -f' goes into detached-HEAD state onto the newest
fetched revision.

Change-Id: Ia715a100b5beaf7e612c2c64cdad8819aa00c8bd
---
M scripts/osmo-deps.sh
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Neels Hofmeyr: Looks good to me, approved; Verified



diff --git a/scripts/osmo-deps.sh b/scripts/osmo-deps.sh
index 0610037..d5a724b 100755
--- a/scripts/osmo-deps.sh
+++ b/scripts/osmo-deps.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -ex
 project="$1"
-branch="${2:-origin/master}"
+branch="origin/${2:-master}"
 
 if ! test -d "$project";
 then

-- 
To view, visit https://gerrit.osmocom.org/4621
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia715a100b5beaf7e612c2c64cdad8819aa00c8bd
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>