summaryrefslogtreecommitdiff
path: root/scripts/utils
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2018-08-26 16:53:31 +0200
committerKarel Kočí <cynerd@email.cz>2018-08-26 16:53:31 +0200
commite1248d3187dbdf05927cb1716e13f2493700d66e (patch)
treecff4c5bfa19abe2ca810052146ba3f38e89a64ae /scripts/utils
parent78483e0fdd6ccfbc4de04028d40d97a2f32bee49 (diff)
downloadlaminar-cnf-e1248d3187dbdf05927cb1716e13f2493700d66e.tar.gz
laminar-cnf-e1248d3187dbdf05927cb1716e13f2493700d66e.tar.bz2
laminar-cnf-e1248d3187dbdf05927cb1716e13f2493700d66e.zip
Even more fixes
Diffstat (limited to 'scripts/utils')
-rw-r--r--scripts/utils5
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/utils b/scripts/utils
index 65ee41a..388d399 100644
--- a/scripts/utils
+++ b/scripts/utils
@@ -13,11 +13,10 @@ echo_stage() {
git_fetch() {
local BRANCH="$3"
[ -n "$BRANCH" ] || BRANCH=master
- local GITARGS="--git-dir=\"$WORKSPACE/$2\" --bare"
if [ -d "$WORKSPACE/$2" ]; then
- git $GITARGS fetch --prune --prune-tags --force "$1" "$BRANCH:$BRANCH"
+ git --git-dir="$WORKSPACE/$2" --bare fetch --prune --prune-tags --force "$1" "$BRANCH:$BRANCH"
else
git clone --bare "$1" "$WORKSPACE/$2"
fi
- git $GITARGS worktree add --detach $2 $BRANCH
+ git --git-dir="$WORKSPACE/$2" --bare worktree add --detach $2 $BRANCH
}