summaryrefslogtreecommitdiff
path: root/backflip
diff options
context:
space:
mode:
authorYvan Roux <yvan.roux@linaro.org>2016-03-15 13:03:51 +0000
committerLinaro Code Review <review@review.linaro.org>2016-03-15 13:03:51 +0000
commit05fd092a06f54ebb74a30200063494032ce1b7ea (patch)
tree2a8c358c918e07633f419f2153ca0f315eb2e28e /backflip
parent13c5b883698b6d5d40d7b0f66518cf9b94de4b98 (diff)
parentb994677b73e0be6f161f9ba0fc0f2dd577358ea4 (diff)
Merge "Exit with an error message if git checkout $DEV_BRANCH fails."
Diffstat (limited to 'backflip')
-rwxr-xr-xbackflip4
1 files changed, 4 insertions, 0 deletions
diff --git a/backflip b/backflip
index e6ba700..6408ba3 100755
--- a/backflip
+++ b/backflip
@@ -221,6 +221,10 @@ fi
print_step "Cherry-picking Revision"
# ==============================================================================
git checkout $DEV_BRANCH
+if [ $? -ne 0 ]; then
+ print_info "Cannot checkout $DEV_BRANCH branch"
+ clean 1
+fi
git cherry-pick -n $SHA1 2>/dev/null
# ==============================================================================