Author: emaste
Date: Sat Oct  7 20:18:20 2017
New Revision: 324397
URL: https://svnweb.freebsd.org/changeset/base/324397

Log:
  MFC r323405: newvers.sh: speed up failing git-svn revision search
  
  In the case of running newvers.sh on a git tree w/o git-svn-id notes we
  previously piped the entire 'git log' to grep. Add --grep to the log
  invocation to avoid processing log entries of no interest.
  
  This saves about 2-3 seconds of newvers.sh run time on my SSD laptop.
  Later changes will bring further speedups.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  stable/11/sys/conf/newvers.sh
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/conf/newvers.sh
==============================================================================
--- stable/11/sys/conf/newvers.sh       Sat Oct  7 20:17:03 2017        
(r324396)
+++ stable/11/sys/conf/newvers.sh       Sat Oct  7 20:18:20 2017        
(r324397)
@@ -218,8 +218,9 @@ if [ -n "$git_cmd" ] ; then
                svn=" r${svn}"
                git="=${git}"
        else
-               svn=`$git_cmd log | grep '^    git-svn-id:' | head -1 | \
-                    sed -n 's/^.*@\([0-9][0-9]*\).*$/\1/p'`
+               svn=`$git_cmd log --grep '^git-svn-id:' | \
+                   grep '^    git-svn-id:' | head -1 | \
+                   sed -n 's/^.*@\([0-9][0-9]*\).*$/\1/p'`
                if [ -z "$svn" ] ; then
                        svn=`$git_cmd log --format='format:%N' | \
                             grep '^svn ' | head -1 | \
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to