This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
laforge gerrit-no-reply at lists.osmocom.orglaforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23796 ) Change subject: deps/Makefile: fix checkout logic for branches ...................................................................... deps/Makefile: fix checkout logic for branches Checkout origin/$branch instead of $branch. Otherwise git will just use the local version of branch and stay at the same commit. Note that Ia846863eff1734eca469257b9a8d5e653a45e835 changes the lines which still have "master" to the commit. Fixing this is still useful however, if a branch name is used in local testing. Change-Id: If6bd440598d375a9947cb3a4fd88ae5809756e0e --- M deps/Makefile 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/deps/Makefile b/deps/Makefile index 64e293b..8dc2a82 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -152,7 +152,15 @@ cd $(1) && git remote set-url origin $(2)/$(1) && git fetch endif ifneq ($$($(1)_HEAD),$($(1)_commit)) - cd $(1) && git fetch && git checkout -q -f "$($(1)_commit)" + cd $(1) && \ + git fetch && \ + if git rev-parse "origin/$($(1)_commit)" 2>/dev/null; then \ + set -x && \ + git checkout -q -f "origin/$($(1)_commit)"; \ + else \ + set -x && \ + git checkout -q -f "$($(1)_commit)"; \ + fi endif endif -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23796 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If6bd440598d375a9947cb3a4fd88ae5809756e0e Gerrit-Change-Number: 23796 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge at osmocom.org> Gerrit-Reviewer: pespin <pespin at sysmocom.de> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210421/96658798/attachment.htm>