From 58d9cb55baa6fb0e6e19c849a24451cbc6bbcf32 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 5 Feb 2020 16:56:42 -0600 Subject: [PATCH] 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 --- src/script/build-integration-branch | 1 + 1 file changed, 1 insertion(+) 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: -- 2.39.5