The branch master has been updated via 6c5159cd3dabd643ad9d594e310a6b450bf770aa (commit) from 8d677266c077c4cd43fad2b814dc9ecbac4727d7 (commit)
- Log ----------------------------------------------------------------- commit 6c5159cd3dabd643ad9d594e310a6b450bf770aa Author: Rich Salz <rs...@akamai.com> Date: Thu Jul 27 06:51:38 2017 -0400 Don't lose author on --squash Instead of doing a squash merge, do a rebase -i ----------------------------------------------------------------------- Summary of changes: review-tools/ghmerge | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/review-tools/ghmerge b/review-tools/ghmerge index 9d00c31..89220c0 100755 --- a/review-tools/ghmerge +++ b/review-tools/ghmerge @@ -46,16 +46,15 @@ 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 -if [ "$MERGE" = "yes" ] ; then - git merge --no-commit --squash $WORK - git commit -else - git rebase $WORK -fi +git rebase $WORK # echo Rebuilding # opensslbuild |& tail -3 @@ -64,14 +63,12 @@ do echo -n "Enter YES to push or NO to abort: " read x x="`echo $x | tr A-Z a-z`" - if [ "$x" = "y" -o "$x" = "yes" -o "$x" = "n" -o "$x" = "no" ] - then + if [ "$x" = "y" -o "$x" = "yes" -o "$x" = "n" -o "$x" = "no" ] ; then break fi done -if [ "$x" = "y" -o "$x" = "yes" ] -then +if [ "$x" = "y" -o "$x" = "yes" ] ; then git push origin $REL fi _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits