From bb98a4e62b89f18ebb1b8bb94feaaa709a5ecb94 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <github@thequod.de>
Date: Sun, 22 Jan 2017 22:52:16 +0100
Subject: [PATCH] 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?
---
 build-utils/travis-apidoc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-utils/travis-apidoc.sh b/build-utils/travis-apidoc.sh
index e3bfb57b..3f264a04 100755
--- a/build-utils/travis-apidoc.sh
+++ b/build-utils/travis-apidoc.sh
@@ -50,7 +50,7 @@ else
   BRANCH="gh-pages"
 fi
 if [ "$BRANCH" != "gh-pages" ]; then
-  git checkout -B "$BRANCH" "origin/${BRANCH}"
+  git checkout -b "$BRANCH" "origin/${BRANCH}" || git checkout -b "$BRANCH"
 fi
 
 # Use a temporary branch for the two commits, which allows for a better UI.