Add the command line to do the backport in interactive mode in case of

issues.

Change-Id: I1515ffab772f5573bbf0971d1104eef460729799

1 files changed, 11 insertions, 1 deletions

diff --git a/backflip b/backflip
index aaa2c0e..a0bde9c 100755
--- a/backflip
+++ b/backflip
@@ -132,7 +132,13 @@ compare() {
 
 clean() {
   git reset --hard
-  git checkout ${DEV_BRANCH}
+  git checkout ${REF_BRANCH}
+  if [ $1 -ne 0 ]; then
+    echo -e "\n${lines}"
+    echo -e "INTERACTIVE MODE COMMAND LINE TO REPRODUCE AND/OR FIX THE ISSUE:"
+    echo -e "$0 -v $VERSION -b $DEV_BRANCH -r $REF_BRANCH $RARGS"
+    echo -e "${lines}"
+  fi
   exit $1
 }
 
@@ -161,6 +167,10 @@ mkdir $TMPDIR
 # ------------------------------------------------------------------------------
 for REV in "$@"; do   # Beginning of Stacked Backport Loop
 # ------------------------------------------------------------------------------
+# Keep remaining args for error messages
+RARGS=$@
+shift
+
 PREFIX=${PREFIX}-${REV}
 
 if [ -n "${PREV}" ]; then