Harald Welte has submitted this change and it was merged. Change subject: deps: Ensure that branches are updated on make update as well ......................................................................
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(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified 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: merged Gerrit-Change-Id: I7d5e0e3d7f92fc51fa438b92f00c79f63945e74f Gerrit-PatchSet: 2 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: daniel <[email protected]> Gerrit-Reviewer: Harald Welte <[email protected]> Gerrit-Reviewer: Jenkins Builder
