[openssl-commits] [tools] master update

[Matt Caswell]

The branch master has been updated
       via  7823d374c6841eac48a7baf1f2955eb962b5305d (commit)
      from  27296557068a17464f17533d89d4fa6f3555b909 (commit)


- Log -----------------------------------------------------------------
commit 7823d374c6841eac48a7baf1f2955eb962b5305d
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Dec 8 10:13:21 2017 +0000

    Add an option to not add yourself as a reviewer
    
    Every now and then I need to merge a commit that I did not author or
    review (someone else has done those things). This adds an option to addrev
    to enable you to add the "Reviewed by" headers without also adding
    yourself.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6)

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

Summary of changes:
 review-tools/addrev | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/review-tools/addrev b/review-tools/addrev
index 6b3d64a..fdf2aa5 100755
--- a/review-tools/addrev
+++ b/review-tools/addrev
@@ -9,6 +9,7 @@ my $list_reviewers = 0;
 my $help = 0;
 my $haveprnum = 0;
 my $trivial = 0;
+my $useself = 1;
 
 my $my_email;
 
@@ -23,6 +24,8 @@ foreach (@ARGV) {
         $args .= "--trivial ";
     } elsif (/^--verbose$/) {
         $args .= "--verbose ";
+    } elsif (/^--noself$/) {
+        $useself = 0;
     } elsif (/^--myemail=(.+)$/) {
         $my_email = $1;
     } elsif (/^--nopr$/) {
@@ -56,11 +59,13 @@ if ($help) {
 
 die "Need either --prnum or --nopr flag" unless $haveprnum;
 
-if (!defined $my_email) {
-    $my_email = `git config --get user.email`;
-}
+if ($useself) {
+    if (!defined $my_email) {
+        $my_email = `git config --get user.email`;
+    }
 
-$args .= "--myemail=$my_email ";
+    $args .= "--myemail=$my_email ";
+}
 
 system("git filter-branch -f --tag-name-filter cat --msg-filter \"gitaddrev $args\" $filterargs");