]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
script/ceph-backport.sh: if --prepare succeeds, continue
authorNathan Cutler <ncutler@suse.com>
Tue, 3 Sep 2019 13:27:57 +0000 (15:27 +0200)
committerNathan Cutler <ncutler@suse.com>
Thu, 5 Sep 2019 11:07:21 +0000 (13:07 +0200)
Signed-off-by: Nathan Cutler <ncutler@suse.com>
src/script/ceph-backport.sh

index 8893ece701e79e6d5613469af3e79963ec67002f..1a67c179ef134c0bffb446bcb708244e8d2a16cc 100755 (executable)
@@ -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"