From: Nathan Cutler <ncutler@suse.com>
Date: Tue, 3 Sep 2019 13:27:57 +0000 (+0200)
Subject: script/ceph-backport.sh: if --prepare succeeds, continue
X-Git-Tag: v15.1.0~1586^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=928697de97247a76a5fa65586de74563641a4770;p=ceph.git

script/ceph-backport.sh: if --prepare succeeds, continue

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/src/script/ceph-backport.sh b/src/script/ceph-backport.sh
index 8893ece701e7..1a67c179ef13 100755
--- a/src/script/ceph-backport.sh
+++ b/src/script/ceph-backport.sh
@@ -273,8 +273,6 @@ function prepare {
         git cherry-pick -x "pr-$original_pr~$i"
     done
     info "Cherry picked $number commits from ${github_endpoint}/pull/${original_pr} into local branch $local_branch"
-
-    exit 0
 }
 
 if git show-ref HEAD >/dev/null 2>&1 ; then
@@ -346,7 +344,7 @@ fi
 
 if [[ $* == *--prepare* ]]; then
     debug "'--prepare' found, will only prepare the backport"
-    prepare  # does not return
+    prepare
 fi
 
 debug "Pushing local branch $local_branch to remote $github_repo"