[openssl-commits] [tools] master update

[Richard Levitte]

The branch master has been updated
       via  81f14d3c92704e0a1bc18fdc5f47d62cf086812f (commit)
       via  a930f701aee0dc0c4ad61ebc792c2281b1f90cbb (commit)
      from  4beedb93e58fd4a25c2d4a293dfade202c980633 (commit)


- Log -----------------------------------------------------------------
commit 81f14d3c92704e0a1bc18fdc5f47d62cf086812f
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Feb 13 15:10:22 2018 +0100

    release-tools/do-copyright-year: in file sed
    
    To make sure we don't lose file permissions, use sed -i
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/12)

commit a930f701aee0dc0c4ad61ebc792c2281b1f90cbb
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Feb 13 15:08:37 2018 +0100

    release-tools/do-copyright-year: don't resurect deleted files
    
    Use 'git diff-tree --name-status' to get the current status of each
    file.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/12)

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

Summary of changes:
 release-tools/do-copyright-year | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/release-tools/do-copyright-year b/release-tools/do-copyright-year
index 59b9235..6c3d710 100755
--- a/release-tools/do-copyright-year
+++ b/release-tools/do-copyright-year
@@ -29,10 +29,10 @@ EOF
 
 NYD=`date +%Y-01-01`
 echo Updating copryight
-git diff-tree -r --name-only `git rev-list -1 --before=$NYD HEAD`..HEAD \
-	| while read FILE ; do
-    sed -E -f /tmp/sed$$ "$FILE" >/tmp/$$
-    mv /tmp/$$ "$FILE"
+git diff-tree -r --name-status `git rev-list -1 --before=$NYD HEAD`..HEAD \
+	| while read STATUS FILE ; do
+    if [ "$STATUS" = 'D' ]; then continue; fi
+    sed -E -f /tmp/sed$$ -i "$FILE"
     git add "$FILE"
 done
 echo Committing change locally.