diff options
author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-10-07 16:54:44 +0300 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2021-11-01 16:02:08 +0300 |
commit | 485aa62c661197601a7648a9c6bc7b8350270bb6 (patch) | |
tree | d9e66d92833353ec75fae351ff4d92408f01762f | |
parent | 670fbf0eec6cbca664de2ec5e17208499bf99ca2 (diff) |
ghmerge: Improve robustness and clarity regarding which ref branch is used
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/94)
-rwxr-xr-x | review-tools/ghmerge | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/review-tools/ghmerge b/review-tools/ghmerge index f58803c..773a6dd 100755 --- a/review-tools/ghmerge +++ b/review-tools/ghmerge @@ -202,28 +202,28 @@ else git fetch $REPO $BRANCH && git cherry-pick FETCH_HEAD fi -echo Diff against $REF -git diff $REF +echo Diff against $REMOTE/$REF +git diff $REMOTE/$REF if [ "$INTERACTIVE" == "yes" ] ; then - echo -n "Press Enter to interactively rebase $AUTOSQUASH on $REF: "; read foo - git rebase -i $AUTOSQUASH $REF || (git rebase --abort; exit 1) - echo "Calling addrev $ADDREVOPTS --prnum=$PRNUM $TEAM ${REF}.." - addrev $ADDREVOPTS --prnum=$PRNUM $TEAM ${REF}.. + echo -n "Press Enter to interactively rebase $AUTOSQUASH on $REMOTE/$REF: "; read foo + git rebase -i $AUTOSQUASH $REMOTE/$REF || (git rebase --abort; exit 1) + echo "Calling addrev $ADDREVOPTS --prnum=$PRNUM $TEAM $REMOTE/$REF.." + addrev $ADDREVOPTS --prnum=$PRNUM $TEAM $REMOTE/$REF.. fi -echo Log since $REF -git log $REF.. +echo Log since $REMOTE/$REF +git log $REMOTE/$REF.. git checkout $REF if [ "$INTERACTIVE" != "yes" ] ; then - echo -n "Press Enter to non-interactively merge --squash $BRANCH to $REF: "; read foo + echo -n "Press Enter to non-interactively merge --squash $BRANCH to $REMOTE/$REF: "; read foo git merge --ff-only --no-commit --squash $WORK AUTHOR=`git show --no-patch --pretty="format:%an <%ae>" $WORK` git commit --author="$AUTHOR" addrev $ADDREVOPTS --prnum=$PRNUM $TEAM $REMOTE/${REF}.. else - # echo -n "Press Enter to merge to $REF: "; read foo + # echo -n "Press Enter to merge to $REMOTE/$REF: "; read foo git merge --ff-only $WORK fi |