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 +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 diff --git a/git-2.7.1.tar.sign b/git-2.7.1.tar.sign deleted file mode 100644 index 49380e0..0000000 Binary files a/git-2.7.1.tar.sign and /dev/null differ 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 0000000..8195df7 Binary files /dev/null and b/git-2.7.2.tar.sign differ 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'