[openssl-commits] [tools] master update

[Rich Salz]

The branch master has been updated
       via  1281a53b704f7d2529832003c6d157489f00a4f7 (commit)
      from  6c5159cd3dabd643ad9d594e310a6b450bf770aa (commit)


- Log -----------------------------------------------------------------
commit 1281a53b704f7d2529832003c6d157489f00a4f7
Author: Rich Salz <rsalz at akamai.com>
Date:   Thu Jul 27 10:04:50 2017 -0400

    Better author-preserve (via Ben Kaduk)

-----------------------------------------------------------------------

Summary of changes:
 review-tools/ghmerge | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/review-tools/ghmerge b/review-tools/ghmerge
index 89220c0..401d80c 100755
--- a/review-tools/ghmerge
+++ b/review-tools/ghmerge
@@ -46,20 +46,21 @@ git pull --rebase https://github.com/$WHO/openssl.git $BRANCH
 git rebase $REL
 echo Diff against $REL
 git diff $REL
-if [ "$MERGE" = "yes" ] ; then
-    echo Edit commits and squash appropriately
-    git rebase -i $REL
-fi
 
 echo -n Press return to merge to $REL and build: ; read foo
 addrev $TRIVIAL --prnum=$PRNUM $TEAM ${REL}..
 git checkout $REL
-git rebase $WORK
+if [ "$MERGE" == "yes" ] ; then
+    git merge --no-commit --squash $WORK
+    AUTHOR=`git show --no-patch --pretty=format:%an <%ae> $WORK`
+    git commit --author="$AUTHOR"
+else
+    git rebase $WORK
+fi
 # echo Rebuilding
 # opensslbuild |& tail -3
 
-while true
-do
+while true ; do
     echo -n "Enter YES to push or NO to abort: "
     read x
     x="`echo $x | tr A-Z a-z`"