summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2015-06-23 16:06:56 +0200
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2015-06-23 16:06:56 +0200
commit741fb5d0722e3abd0081e5b679ad27504e2fb9c6 (patch)
tree2e2f050c781a61a1910cf6197cf485b582695da1
parent5ddedd5aa6b28e2e14ca1d1b581ae1a583989c71 (diff)
downloaddocker-741fb5d0722e3abd0081e5b679ad27504e2fb9c6.tar.gz
Avoid attempting to checkout a detached branch
-rwxr-xr-xci/entrypoint.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/entrypoint.sh b/ci/entrypoint.sh
index 466a1e9..d67cc4d 100755
--- a/ci/entrypoint.sh
+++ b/ci/entrypoint.sh
@@ -65,7 +65,7 @@ else
git reset --hard origin/master
git clean -d -f -x
- for branch in $(git branch -la | sed -e 's/^* //g' -e 's/ //g' -e '/remotes\/origin\/HEAD/d' -e 's|remotes/origin/||g'); do
+ for branch in $(git branch -la | sed -e 's/^* //g' -e '/\(detached from/d' -e 's/ //g' -e '/remotes\/origin\/HEAD/d' -e 's|remotes/origin/||g'); do
git checkout $branch
done