From 8c5b275bf466c43fcc92d358f21f689aea0de98b8cb22344a1e0185f55be99ac Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Thu, 25 Feb 2016 21:00:43 +0000
Subject: [PATCH] Accepting request 361090 from devel:tools:scm

git 2.7.2

OBS-URL: https://build.opensuse.org/request/show/361090
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=175
---
 git-2.7.1-fix-tests-grep-2.23.patch |  91 ++++++++++++++++++++++++++++
 git-2.7.1.tar.sign                  | Bin 543 -> 0 bytes
 git-2.7.1.tar.xz                    |   3 -
 git-2.7.2.tar.sign                  | Bin 0 -> 543 bytes
 git-2.7.2.tar.xz                    |   3 +
 git.changes                         |  19 ++++++
 git.spec                            |   4 +-
 7 files changed, 116 insertions(+), 4 deletions(-)
 create mode 100644 git-2.7.1-fix-tests-grep-2.23.patch
 delete mode 100644 git-2.7.1.tar.sign
 delete mode 100644 git-2.7.1.tar.xz
 create mode 100644 git-2.7.2.tar.sign
 create mode 100644 git-2.7.2.tar.xz

diff --git a/git-2.7.1-fix-tests-grep-2.23.patch b/git-2.7.1-fix-tests-grep-2.23.patch
new file mode 100644
index 0000000..bccbdcd
--- /dev/null
+++ b/git-2.7.1-fix-tests-grep-2.23.patch
@@ -0,0 +1,91 @@
+From: Andreas Stieger <astieger@suse.com>
+Date: Mon, 15 Feb 2016 15:00:57 +0000
+Subject: fix build with GNU grep 2.23
+References: http://permalink.gmane.org/gmane.comp.version-control.git/285733
+Upstream: it's on the mailing list
+
+grep 2.23 changed binary matching
+
+[ 1421s] *** t8005-blame-i18n.sh ***
+[ 1421s] not ok 2 - blame respects i18n.commitencoding
+[ 1421s] #	
+[ 1421s] #		git blame --incremental file | \
+[ 1421s] #			egrep "^(author|summary) " &gt; actual &amp;&amp;
+[ 1421s] #		test_cmp actual expected
+[ 1421s] #	
+[ 1421s] not ok 3 - blame respects i18n.logoutputencoding
+[ 1421s] #	
+[ 1421s] #		git config i18n.logoutputencoding eucJP &amp;&amp;
+[ 1421s] #		git blame --incremental file | \
+[ 1421s] #			egrep "^(author|summary) " &gt; actual &amp;&amp;
+[ 1421s] #		test_cmp actual expected
+[ 1421s] #	
+[ 1421s] not ok 4 - blame respects --encoding=UTF-8
+[ 1421s] #	
+[ 1421s] #		git blame --incremental --encoding=UTF-8 file | \
+[ 1421s] #			egrep "^(author|summary) " &gt; actual &amp;&amp;
+[ 1421s] #		test_cmp actual expected
+[ 1421s] #	
+[ 1422s] not ok 5 - blame respects --encoding=none
+[ 1422s] #	
+[ 1422s] #		git blame --incremental --encoding=none file | \
+[ 1422s] #			egrep "^(author|summary) " &gt; actual &amp;&amp;
+[ 1422s] #		test_cmp actual expected
+[ 1422s] #	
+[ 1422s] # failed 4 among 5 test(s)
+[ 1422s] 1..5
+[ 1422s] Makefile:44: recipe for target 't8005-blame-i18n.sh' failed
+
+Index: git-2.7.1/t/t8005-blame-i18n.sh
+===================================================================
+--- git-2.7.1.orig/t/t8005-blame-i18n.sh	2016-02-06 00:31:08.000000000 +0100
++++ git-2.7.1/t/t8005-blame-i18n.sh	2016-02-15 15:59:02.557155352 +0100
+@@ -36,7 +36,7 @@ EOF
+ test_expect_success !MINGW \
+ 	'blame respects i18n.commitencoding' '
+ 	git blame --incremental file | \
+-		egrep "^(author|summary) " > actual &&
++		egrep -a "^(author|summary) " > actual &&
+ 	test_cmp actual expected
+ '
+ 
+@@ -53,7 +53,7 @@ test_expect_success !MINGW \
+ 	'blame respects i18n.logoutputencoding' '
+ 	git config i18n.logoutputencoding eucJP &&
+ 	git blame --incremental file | \
+-		egrep "^(author|summary) " > actual &&
++		egrep -a "^(author|summary) " > actual &&
+ 	test_cmp actual expected
+ '
+ 
+@@ -69,7 +69,7 @@ EOF
+ test_expect_success !MINGW \
+ 	'blame respects --encoding=UTF-8' '
+ 	git blame --incremental --encoding=UTF-8 file | \
+-		egrep "^(author|summary) " > actual &&
++		egrep -a "^(author|summary) " > actual &&
+ 	test_cmp actual expected
+ '
+ 
+@@ -85,7 +85,7 @@ EOF
+ test_expect_success !MINGW \
+ 	'blame respects --encoding=none' '
+ 	git blame --incremental --encoding=none file | \
+-		egrep "^(author|summary) " > actual &&
++		egrep -a "^(author|summary) " > actual &&
+ 	test_cmp actual expected
+ '
+ 
+Index: git-2.7.1/t/t9200-git-cvsexportcommit.sh
+===================================================================
+--- git-2.7.1.orig/t/t9200-git-cvsexportcommit.sh	2016-02-06 00:31:08.000000000 +0100
++++ git-2.7.1/t/t9200-git-cvsexportcommit.sh	2016-02-15 15:59:44.445790113 +0100
+@@ -35,7 +35,7 @@ exit 1
+ 
+ check_entries () {
+ 	# $1 == directory, $2 == expected
+-	grep '^/' "$1/CVS/Entries" | sort | cut -d/ -f2,3,5 >actual
++	grep -a '^/' "$1/CVS/Entries" | sort | cut -d/ -f2,3,5 >actual
+ 	if test -z "$2"
+ 	then
+ 		>expected
diff --git a/git-2.7.1.tar.sign b/git-2.7.1.tar.sign
deleted file mode 100644
index 49380e0434748b3d5dd1a429815b0f368c126768e6b64828621fb16afd4647bf..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 543
zcmV+)0^t3L0vrSY0RjL91p-#JF<<}+2@tTg=!TZB=F3qO5C3pW8qNWzh;m@niG?(s
zGSg8DK1to7M`&3+6Q=V>&4JE_mfw1U7z&$+byiUGF;Ss@ki=A4QT#1v`*)T|7h@OX
z7-lgg%r`<M-Dti-6o~g%*#}&HK(0E+0IR5l7%*%uLPPtC?Vt4Bd^0%|4^aeHuY3TM
zaOV5hMpKr8h<S6u8J73V7tdso3=TnoIguiNHOU;l``^v1z0II7oa<5{gRI!idtgaw
zMZa#wLcY7NW*u%ms@8E&xM|FxX-xVA48uH&>#HdBurGtTIOPef+jU_@YajeWp`0yQ
zkz`y;Ox+_;z{x$CN|4r8db0vek0t{#kzFOUAXk%MqauGd=jP3l;Qbk-#m+WvB+`8e
zReQEiJ>z1Qlr^(LGoyU`yW8Fiy#%L!b{K#5fiblCh{M@w-$ux29{U^05ZUtT-Iq?K
z90cTke*c^qKE4HvpF*#+SS9!A*$b|2c1cT}=V%%yQ+RAgL!S2cJ@Sz}CIIym*7&y<
z<Q1yD%iZbo>t0wMun7e{g-bTtjbHAX4b63Rphukb&z4uz;M=X4@*ysjJhmWkja5vw
zO+bml-e9;MVX(EODKPAM@+Ab@Y>8Ae`^RisgZ9X1%I47p*Duk+8xpxrSP&xBTqn}G
hlta227Z)U)Z_ro{XHl!ioY;LrOuowtd{oc^5KpD#1iAnK

diff --git a/git-2.7.1.tar.xz b/git-2.7.1.tar.xz
deleted file mode 100644
index 9da5899..0000000
--- a/git-2.7.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:477a8137de342f858d364383266e9551e582718e96b34051a6aaef57606d6bfe
-size 3905876
diff --git a/git-2.7.2.tar.sign b/git-2.7.2.tar.sign
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..8195df70ec466c955f97c1d0fa97af386eb1c812493eb4049ce74ab5ed1ab5b9
GIT binary patch
literal 543
zcmV+)0^t3L0vrSY0RjL91p-#fh3o(d2@tTg=!TZB=F1UI5CE~PAtSJ)Yxi=OO&U=%
zpy&7TVB)S{=m~lseu*7FWW}uVL6pg29on+`<(j74=^hO*DbmlfiF`m}6)Sv2-DWZg
za1Y1jBWe|ay%&D5@KLB|qQT)PM{>MDGfDmj>kaA>(WgE1TI#-Z8fa!<E!NZ>%cUXR
z#)(_n!;UQlU(2t8lP|UaBFu7B8@aW8rt;^19}WZdwq81}t0e|b8BizT=aLc01(vs#
zo1y0k*0g&r&Dnn@#Fja^h63K5csQ~jLG*`U-UriPfc=QzAcgp~_+D2?+V9H;3Y1b|
zEJ7Y?FW*flTq6?qpvm943=kvG$FS(@H(O1bNnDO_aki1sH)nhWLXQAZn{+m77L@~}
z-Ku{00gAHa%&U;uaoq{wxlbY`CQBwqGE3Z<4k*@XDBlKV2ZMRPMt}#bo4w{D3`DkM
z+Bt9iLC<ovy-k8ur$VoEzO^2uN)RI6)`*3LoO}wr2rd)>TPkKjuC#5GSPx~q>`@ur
zVE6qyii3un!>m;=&d<lUWAWQHpZ*scSO#a+|F&r>kuK2kAGo~p*>DJ~90<uM$HDcA
zyXQ1xWa`{Jhy};iLo56pPS$K{FMXa4zjl*|EgTn?fpb^8QO$rsi*W-i#v|MfAod6U
hkq-`sTxJYM5yw0h&cqQ!pLSNa1CxgPftCbmRz$$R0CxZY

literal 0
HcmV?d00001

diff --git a/git-2.7.2.tar.xz b/git-2.7.2.tar.xz
new file mode 100644
index 0000000..88978d2
--- /dev/null
+++ b/git-2.7.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b20479ce523031c37581b763b4442b25b9d606f2f416049aea4e463dc150cf20
+size 3907296
diff --git a/git.changes b/git.changes
index f9b9d25..4cc882f 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Tue Feb 23 10:14:22 UTC 2016 - astieger@suse.com
+
+- git 2.7.2:
+  * improvements placing conflict markers with different line
+    terminators
+  * "git worktree" fixes for manually moved paths
+  * "git push --force-with-lease" has been taught to report if the
+    push needed to force (or fast-forwarded).
+  * vimdiff backend improvements for "git mergetool": buffer order
+  * improvements for handling paths added to index with "add -N"
+    which are not in the index yet
+
+-------------------------------------------------------------------
+Mon Feb 15 15:02:44 UTC 2016 - astieger@suse.com
+
+- fix test failures with grep 2.23
+  add git-2.7.1-fix-tests-grep-2.23.patch
+
 -------------------------------------------------------------------
 Sat Feb  6 08:30:57 UTC 2016 - astieger@suse.com
 
diff --git a/git.spec b/git.spec
index 01f8bd5..d770dab 100644
--- a/git.spec
+++ b/git.spec
@@ -26,7 +26,7 @@
 %endif
 
 Name:           git
-Version:        2.7.1
+Version:        2.7.2
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0
@@ -51,6 +51,7 @@ Patch5:         git-bash-completion-egrep-color-fix.diff
 Patch6:         git-tcsh-completion-fixes.diff
 # adapt paths in zsh completion (bnc#853183)
 Patch7:         git-zsh-completion-fixes.diff
+Patch8:         git-2.7.1-fix-tests-grep-2.23.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  apache2
 BuildRequires:  asciidoc
@@ -241,6 +242,7 @@ directory /git/ that calls the cgi script.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 cat > .make <<'EOF'