[PATCH] osmo-ttcn3-hacks[master]: deps: Ensure that branches are updated on make update as well

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/.

daniel gerrit-no-reply at lists.osmocom.org
Tue Feb 6 16:31:25 UTC 2018


Hello Jenkins Builder,

I'd like you to reexamine a change.  Please visit

    https://gerrit.osmocom.org/6292

to look at the new patch set (#2).

deps: Ensure that branches are updated on make update as well

Don't just force-checkout the local master branch again, but reset to
origin/master

Change-Id: I7d5e0e3d7f92fc51fa438b92f00c79f63945e74f
---
M deps/Makefile
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/92/6292/2

diff --git a/deps/Makefile b/deps/Makefile
index e1cbfe3..6f975f2 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -55,7 +55,7 @@
 
 .PHONY:$(1)/update
 $(1)/update: $(1)
-	(cd $(1) && git fetch && git checkout -f -B master)
+	(cd $(1) && git fetch && git checkout -f -B master origin/master)
 
 .PHONY: $(1)/clean
 $(1)/clean:

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

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I7d5e0e3d7f92fc51fa438b92f00c79f63945e74f
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder



More information about the gerrit-log mailing list