From: Sage Weil <sage@redhat.com>
Date: Wed, 5 Feb 2020 22:56:42 +0000 (-0600)
Subject: build-integration-branch: don't fail on existing branch
X-Git-Tag: v15.1.1~526^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33093%2Fhead;p=ceph.git

build-integration-branch: don't fail on existing branch

This behavior is too annoying, and you can always get back to something
clobbered with 'git reflog'.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/script/build-integration-branch b/src/script/build-integration-branch
index 1dae51f930618..7430237ceceba 100755
--- a/src/script/build-integration-branch
+++ b/src/script/build-integration-branch
@@ -86,6 +86,7 @@ print("branch %s" % branch)
 
 # assemble
 print('--- creating branch %s' % branch)
+r = call(['git', 'branch', '-D', branch])
 r = call(['git', 'checkout', '-b', branch])
 assert not r
 for pr in prs: