From 5e8e211e2670517f8d829841f85381752b68777a Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Sat, 20 Feb 2016 04:57:16 +0000
Subject: [PATCH] git-2.7.1 : /me swears at grep-2.23, again (already reported
 upstream).

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@16980 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  4 ++--
 general/prog/git.xml               | 16 ++++++++++------
 introduction/welcome/changelog.xml | 10 ++++++++++
 packages.ent                       |  2 +-
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/general.ent b/general.ent
index 22f7b6fcdb..c9ad471f25 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "16">                   <!-- Always 2 digits -->
+<!ENTITY day          "19">                   <!-- Always 2 digits -->
 <!ENTITY month        "02">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "February 14th &year;">
+<!ENTITY releasedate  "February 19th &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development] -->
diff --git a/general/prog/git.xml b/general/prog/git.xml
index df3d345472..f4892246ec 100644
--- a/general/prog/git.xml
+++ b/general/prog/git.xml
@@ -8,10 +8,11 @@
 
   <!ENTITY git-download-http "&git-root;/git-&git-version;.tar.xz">
   <!ENTITY git-download-ftp  "ftp://ftp.kernel.org/pub/software/scm/git/git-&git-version;.tar.xz">
-  <!ENTITY git-md5sum        "0214e04f7041f835c5c38f2b78eccced">
-  <!ENTITY git-size          "3.7 MB">
-  <!ENTITY git-buildsize     "349 MB (add 28 MB for building documentation)">
-  <!ENTITY git-time          "0.7 SBU (add 12 SBU for tests and 2.4 SBU for building documentation)">
+  <!ENTITY git-md5sum        "eece7b1e87983271621a0cb6aab37a25">
+  <!ENTITY git-size          "3.8 MB">
+  <!ENTITY git-buildsize     "364 MB (including the pre-built documentation)">
+  <!ENTITY git-time          "0.8 SBU (add 2.4 SBU for building documentation)">
+  <!-- tests used to take 12 SBU, grep-2.23 causes them to fail after 4.0 SBU -->
 ]>
 
 <sect1 id="git" xreflabel="git-&git-version;">
@@ -169,8 +170,11 @@ make</userinput></screen>
 <screen><userinput>make man</userinput></screen>
 
     <para>
-      The test suite can be run in parallel mode. To run the test suite, issue:
-      <command>make test</command>.
+<!--  The test suite can be run in parallel mode. To run the test suite, issue: -->
+      The test suite fails early, in 'blame respects encoding', because grep-2.23
+      treats data in the locale tests as binary.  To run the tests up to that
+      point issue:
+      <command>make test</command>. -->
     </para>
 
     <para>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index a01667112d..68d00b1110 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,16 @@
 
 -->
 
+    <listitem>
+      <para>February 19th, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Updated to git-2.7.1.  Fixes
+          <ulink url="&blfs-ticket-root;7322">#7322</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>February 16th, 2016</para>
       <itemizedlist>
diff --git a/packages.ent b/packages.ent
index 86d1dadb2a..e9ac434c96 100644
--- a/packages.ent
+++ b/packages.ent
@@ -268,7 +268,7 @@
 <!ENTITY gcc-ada-version              "5.3.0">
 <!ENTITY gc-version                   "7.4.2">
 <!ENTITY gdb-version                  "7.10.1">
-<!ENTITY git-version                  "2.7.0">
+<!ENTITY git-version                  "2.7.1">
 <!ENTITY guile-version                "2.0.11">
 <!ENTITY librep-version               "0.92.5">
 <!ENTITY llvm-version                 "3.7.1">