awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

travis-apidoc.sh: revert -B with git-checkout (#1431) 

Reverts part of 6b8c3642b to fix:

> Cloning into 'build/apidoc'...
> fatal: Cannot update paths and switch to branch 'pr-1429' at the same
> time.
> Did you intend to checkout 'origin/pr-1429' which can not be resolved
> as commit?
This commit is contained in:
Daniel Hahler 2017-01-22 22:52:16 +01:00 committed by GitHub
parent 9553f616c0
commit bb98a4e62b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-utils/travis-apidoc.sh
View File

@ -50,7 +50,7 @@ else
BRANCH="gh-pages" BRANCH="gh-pages"
fi fi
if [ "$BRANCH" != "gh-pages" ]; then if [ "$BRANCH" != "gh-pages" ]; then
git checkout -B "$BRANCH" "origin/${BRANCH}" git checkout -b "$BRANCH" "origin/${BRANCH}" || git checkout -b "$BRANCH"
fi fi
# Use a temporary branch for the two commits, which allows for a better UI. # Use a temporary branch for the two commits, which allows for a better UI.