8c5b275bf4
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
92 lines
3.2 KiB
Diff
92 lines
3.2 KiB
Diff
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) " > actual &&
|
|
[ 1421s] # test_cmp actual expected
|
|
[ 1421s] #
|
|
[ 1421s] not ok 3 - blame respects i18n.logoutputencoding
|
|
[ 1421s] #
|
|
[ 1421s] # git config i18n.logoutputencoding eucJP &&
|
|
[ 1421s] # git blame --incremental file | \
|
|
[ 1421s] # egrep "^(author|summary) " > actual &&
|
|
[ 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) " > actual &&
|
|
[ 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) " > actual &&
|
|
[ 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
|