[PATCH] osmo-ttcn3-hacks[master]: deps/Makefile: Add missing "git fetch" to /update and /clean...

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

Harald Welte gerrit-no-reply at lists.osmocom.org
Tue Mar 27 18:52:43 UTC 2018


Review at  https://gerrit.osmocom.org/7539

deps/Makefile: Add missing "git fetch" to /update and /clean targets

When the Makefile was modified to use a new tag/hash of a given
repo, the "make update" or "make clean" target will fail as the
new version/tag is not yet known to the local repo, only to the
remote (and hence we need a fetch).

Change-Id: I52c44c744674cd4dab0c85086d68bde6f9be1fca
---
M deps/Makefile
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/39/7539/1

diff --git a/deps/Makefile b/deps/Makefile
index 5641ebe..626bcc1 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -111,7 +111,7 @@
 	cd $(1) && git remote set-url origin $(2)/$(1) && git fetch
 endif
 ifneq ($$($(1)_HEAD),$($(1)_commit))
-	cd $(1) && git checkout -q -f "$($(1)_commit)"
+	cd $(1) && git fetch && git checkout -q -f "$($(1)_commit)"
 endif
 endif
 
@@ -120,7 +120,7 @@
 ifeq ($$($(1)_MODIFIED),1)
 	@echo "WARNING: $(1) skipped because it contains uncommitted modifications!"
 else
-	cd $(1) && git checkout -q -f "$($(1)_commit)" && git reset --hard
+	cd $(1) && git fetch && git checkout -q -f "$($(1)_commit)" && git reset --hard
 endif
 
 .PHONY: $(1)/distclean

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52c44c744674cd4dab0c85086d68bde6f9be1fca
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>



More information about the gerrit-log mailing list