From 55f69c35a97f904774a12ea1f28d184f906ac41d Mon Sep 17 00:00:00 2001 From: "Dominic M. Schlott" Date: Thu, 24 Jun 2021 06:58:21 +0200 Subject: [PATCH] update toychain calling script --- bin/toychain | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bin/toychain b/bin/toychain index 130360d..207ed58 100755 --- a/bin/toychain +++ b/bin/toychain @@ -75,8 +75,15 @@ tcupdate() { shift; tag=$2 echo "$pgm: updating daemon with tag $tag..." - git pull origin master # 1> transcript.log 2>&1 + top=$(git rev-parse --show-toplevel) + echo // updating $top + git pull --ff-only origin master # 1> transcript.log 2>&1 + echo // checking out $tag git checkout $tag # 1> transcript.log 2>&1 + cd $top/lib + echo // updating $top/lib + git pull --ff-only origin master # 1> transcript.log 2>&1 + git log -1 echo "---" }