osmith has uploaded this change for review.
deps: make output readable
Instead of having a silent fetch and commits printed to stdout without
information about the repository they belong to, change the output to
have one line per git action and to include the repository name in each
of them.
Example output:
[titan.ProtocolEmulations.M3UA] Checking out b58f92046e48a7b1ed531e243a2319ebca53bf4c
[titan.ProtocolModules.IP] Checking out 1be86705f39ae38f3c04b2109806ee20d25e91d0
[titan.ProtocolModules.GTP_v13.5.0] Checking out 6b769f985eb91bf5a4332f29faa4a043b23ce62e
[titan.ProtocolModules.ICMP] Checking out e49d9fb9f7de637b4bf4803dc6b6e911a8661640
[osmo-uecups] Initial git clone
[titan.ProtocolModules.DIAMETER_ProtocolModule_Generator] Checking out ffd939595a08da1b8c8176aaa1f8578bfe02a912
[titan.ProtocolModules.L2TP] Checking out 17e76d3662bd0bb815158e8a9de1ec413f21b530
[titan.ProtocolModules.ICMPv6] Checking out 46f4d9b6e1e3c794294a92588401a81e4881dd27
[titan.ProtocolModules.LLC_v7.1.0] Checking out 09817f113255d7fb56f1d45d3dd629a093d9248d
[titan.ProtocolModules.M3UA] Checking out c496d298876fed55c2b730278b7ee77982555563
[titan.ProtocolModules.PFCP_v15.1.0] Checking out d550ad9ddb6f9c823c9a555254cd76cf0e738d18
[titan.ProtocolModules.MobileL3_v13.4.0] Checking out b6602eb357673f097ea1a1d22edd568ecd239da1
[titan.TestPorts.TELNETasp] Checking out 873fe539642542cd9a901c208f1ec11c6d2f5387
[titan.TestPorts.SIPmsg] Checking out 78bf0daf8c599d374089d97a054914d8439d133a
[titan.TestPorts.UDPasp] Checking out 54176e95850654e5e8b0ffa2f1b5f35c412b949c
[titan.ProtocolModules.BSSGP_v13.0.0] Checking out e97d92a8b66bec399babea52f593771b76cb175a
[titan.ProtocolModules.BSSMAP] Checking out 4acb6ab5f058477f0b90c2da182d52054e3614b0
[osmo-uecups] Updating URL to https://gerrit.osmocom.org/osmo-uecups
[osmo-uecups] Checking out 8362efef7c6fa341eb947a75786878e0685767b7
Change-Id: I0231488b02fdb5aa19b864e51864682ebbb3b0c6
---
M deps/Makefile
M deps/update.sh
2 files changed, 9 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/21/38221/1
diff --git a/deps/Makefile b/deps/Makefile
index 460c2a6..6830933 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -147,7 +147,8 @@
$(1)_MODIFIED!= if [ -d $(1) ]; then cd $(1) && git diff --quiet --exit-code || echo -n "1"; fi
$(1):
- git clone $(2)/$(1)
+ @echo "[$(1)] Initial git clone"
+ @git clone -q $(2)/$(1)
.PHONY: $(1)/update
$(1)/update: $(1)
@@ -155,10 +156,11 @@
@echo "WARNING: $(1) skipped because it contains uncommitted modifications!"
else
ifneq ($$($(1)_ORIGIN),$(2)/$(1))
- cd $(1) && git remote set-url origin $(2)/$(1) && git fetch
+ @echo "[$(1)] Updating URL to $(2)/$(1)"
+ @cd $(1) && git remote set-url origin $(2)/$(1) && git fetch
endif
ifneq ($$($(1)_HEAD),$($(1)_commit))
- ./update.sh "$(1)" "$($(1)_commit)"
+ @./update.sh "$(1)" "$($(1)_commit)" "$$($(1)_HEAD)"
endif
endif
diff --git a/deps/update.sh b/deps/update.sh
index c0a3dab..046fb69 100755
--- a/deps/update.sh
+++ b/deps/update.sh
@@ -5,13 +5,14 @@
cd "$DIR"
if ! git cat-file -e "$COMMIT"; then
+ echo "[$DIR] Missing $COMMIT, fetching git repository"
git fetch
fi
-if git rev-parse "origin/$COMMIT" 2>/dev/null; then
- set -x
+if git rev-parse -q "origin/$COMMIT" 1>/dev/null 2>&1; then
+ echo "[$DIR] Checking out origin/$COMMIT"
git checkout -q -f "origin/$COMMIT"
else
- set -x
+ echo "[$DIR] Checking out $COMMIT"
git checkout -q -f "$COMMIT"
fi
To view, visit change 38221. To unsubscribe, or for help writing mail filters, visit settings.