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
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
parent
9dd611351a
commit
8c5b275bf4
91
git-2.7.1-fix-tests-grep-2.23.patch
Normal file
91
git-2.7.1-fix-tests-grep-2.23.patch
Normal file
@ -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) " > 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
|
||||
Binary file not shown.
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:477a8137de342f858d364383266e9551e582718e96b34051a6aaef57606d6bfe
|
||||
size 3905876
|
||||
BIN
git-2.7.2.tar.sign
Normal file
BIN
git-2.7.2.tar.sign
Normal file
Binary file not shown.
3
git-2.7.2.tar.xz
Normal file
3
git-2.7.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b20479ce523031c37581b763b4442b25b9d606f2f416049aea4e463dc150cf20
|
||||
size 3907296
|
||||
19
git.changes
19
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
|
||||
|
||||
|
||||
4
git.spec
4
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'
|
||||
|
||||
Loading…
Reference in New Issue
Block a user