浏览代码

scripts/update.sh: fix checkout of correct base commit after fetching

Matthias Schiffer 7 年之前
父节点
当前提交
16648ce242
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      scripts/update.sh

+ 4 - 1
scripts/update.sh

@@ -16,5 +16,8 @@ for module in $GLUON_MODULES; do
 	git init
 	git config commit.gpgsign false
 
-	git branch -f base $commit 2>/dev/null || git fetch -f $repo $branch:base
+	if ! git branch -f base $commit 2>/dev/null; then
+		git fetch $repo $branch
+		git branch -f base $commit 2>/dev/null
+	fi
 done