aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sokolovsky <paul.sokolovsky@linaro.org>2016-04-01 15:48:55 +0300
committerPaul Sokolovsky <paul.sokolovsky@linaro.org>2016-04-01 15:48:55 +0300
commitc4263805fb8313e1a698876d31d37fbec25ce70c (patch)
tree1ba525bb4810bc85416d762dbf8c27058b6fbb6b
parent0cb734455251f407f150914d66917bffc02969d0 (diff)
toolchain-tools: dejagnu: Don't overwrite local branches when mirroring.
dejagnu mirror transfer repo config was set to "mirror = true", which caused removal of any locally created branches in the main toolchain/dejagnu repo. "mirror = true" is now disabled in the config, and this change mirrors new/existing branches/tags, but doesn't remove any local branches. (Local branch creation is subject to ACLs and constraints on Gerrit side.) Change-Id: I69616493cdb0062db0fac4f35ec117c19cc0e924
-rwxr-xr-xtoolchain-tools2
1 files changed, 1 insertions, 1 deletions
diff --git a/toolchain-tools b/toolchain-tools
index ad8b79d..6a92ee3 100755
--- a/toolchain-tools
+++ b/toolchain-tools
@@ -94,7 +94,7 @@ function update_dejagnu_mirror() {
stubborn_do git remote update
if [ $? == 0 ]
then
- logiferr "$GITOLITE_BIN push"
+ logiferr "$GITOLITE_BIN push --force origin 'refs/heads/*' 'refs/tags/*'"
fi
}