[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b3-274-g970a6f4

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  970a6f4d051372b5af02cff890f41c9539c627e3 (commit)
      from  637cf86f6f7dd3c444133e69874a0739640d2dfc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/970a6f4d051372b5af02cff890f41c9539c627e3

commit 970a6f4d051372b5af02cff890f41c9539c627e3
Author: Pavan Balaji <balaji at anl.gov>
Date:   Tue Jul 21 23:45:55 2015 -0500

    Minor correction to the git-conflicts script.
    
    The probability of conflict for the next commit is more relevant than
    that of all the commits.
    
    No reviewer.

diff --git a/maint/git-conflicts.bash b/maint/git-conflicts.bash
index e61f0f9..780c535 100755
--- a/maint/git-conflicts.bash
+++ b/maint/git-conflicts.bash
@@ -23,9 +23,9 @@ done
 ##
 
 echo
-echo "Probability of Collision:"
+echo "Probability of collision on your next commit:"
 echo "Format:   [abbrev length]: probability of collision"
 for ((; x <= ${max_abbrev} ; x++)) ; do
-    percent=`echo "scale=8 ; 100 * ($total ^ 2) / (16 ^ $x)" | bc | awk '{ printf("%1.2f\n", $0); }'`
+    percent=`echo "scale=8 ; 100 * ($total) / (16 ^ $x)" | bc | awk '{ printf("%1.4f\n", $0); }'`
     echo "    [$x]: $percent %"
 done

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

Summary of changes:
 maint/git-conflicts.bash |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
MPICH primary repository