ghmerge and pick-to-branch: improve hints on how to handle conflicts

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/tools/pull/126)

diff --git a/review-tools/ghmerge b/review-tools/ghmerge
index 08808ca18e1bd33c236e184e319a1821d92aab76..edcb80a26ff36010aead55526265ecc6188bb0d4 100755 (executable)
--- a/review-tools/ghmerge
+++ b/review-tools/ghmerge
@@ -212,7 +212,7 @@ if [ "$PICK" == "no" ]; then
     git fetch $REPO $BRANCH && git checkout -b $WORK FETCH_HEAD
     WORK_USED=$WORK
     REBASING=1
-    git rebase $TARGET || (echo 'Fix or Ctrl-d to abort' ; read || exit 1)
+    git rebase $TARGET || (echo -ne "Press Ctrl-d to abort, or fix the issue in another shell,\n    run 'git rebase --continue' there, and on success press Enter here: "; read || exit 1)
     REBASING=
 else
     echo Cherry-picking $REPO/$BRANCH to $TARGET...

diff --git a/review-tools/pick-to-branch b/review-tools/pick-to-branch
index caefefaf61cfcf58f3b1ee73c07998c917ad65da..25be68b0eefd7b258b76adbb34daaae42154217d 100755 (executable)
--- a/review-tools/pick-to-branch
+++ b/review-tools/pick-to-branch
@@ -77,7 +77,7 @@ echo "Commit(s) to be cherry-picked:"
 git log $id~$num..$id
 echo
 
-echo -n "Press Enter to continue, Ctrl-C to abort:"; read foo
+echo -n "Press Enter to continue, Ctrl-C to abort: "; read foo
 
 ORIG_REF=`git rev-parse --abbrev-ref HEAD` # usually this will be 'master'
 if [ "$target" != "$ORIG_REF" ]; then
@@ -112,7 +112,7 @@ git checkout $target
 ORIG_TARGET_HEAD=`git show -s --format="%H"`
 git pull --ff-only `git rev-parse --abbrev-ref  @{u} | sed "s|/| |"`
 CHERRYPICKING=1
-git cherry-pick -e -x $id~$num..$id || (echo 'Fix or Ctrl-d to abort' ; read || exit 1)
+git cherry-pick -e -x $id~$num..$id || (echo -ne "Press Ctrl-d to abort, or fix the issue in another shell,\n    run 'git cherry-pick --continue' there, and on success press Enter here: "; read || exit 1)
 CHERRYPICKING=
 
 echo