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 1dae51f9306184b6f2409179b1f0e28830c14588..7430237ceceba930bfa6cd010a3440a86c833395 100755 (executable)
--- 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: