diff --git a/git-2.7.1-fix-tests-grep-2.23.patch b/git-2.7.1-fix-tests-grep-2.23.patch deleted file mode 100644 index bccbdcd..0000000 --- a/git-2.7.1-fix-tests-grep-2.23.patch +++ /dev/null @@ -1,91 +0,0 @@ -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.2.tar.sign b/git-2.7.2.tar.sign deleted file mode 100644 index 8195df7..0000000 Binary files a/git-2.7.2.tar.sign and /dev/null differ diff --git a/git-2.7.2.tar.xz b/git-2.7.2.tar.xz deleted file mode 100644 index 88978d2..0000000 --- a/git-2.7.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b20479ce523031c37581b763b4442b25b9d606f2f416049aea4e463dc150cf20 -size 3907296 diff --git a/git-2.7.3.tar.sign b/git-2.7.3.tar.sign new file mode 100644 index 0000000..78dc8ba Binary files /dev/null and b/git-2.7.3.tar.sign differ diff --git a/git-2.7.3.tar.xz b/git-2.7.3.tar.xz new file mode 100644 index 0000000..bebe1c2 --- /dev/null +++ b/git-2.7.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89c467912d4740da2b40288f956251f0a1e276e28eecd28a6d776067103629b6 +size 3909636 diff --git a/git.changes b/git.changes index 4cc882f..b7a747a 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Fri Mar 11 08:38:09 UTC 2016 - astieger@suse.com + +- git 2.7.3: + * "git show 'HEAD:Foo[BAR]Baz'" did not interpret the argument as a + rev, i.e. the object named by the the pathname with wildcard + characters in a tree object. + * "git rev-parse --git-common-dir" used in the worktree feature + misbehaved when run from a subdirectory. + * The "v(iew)" subcommand of the interactive "git am -i" command was + broken in 2.6.0 timeframe when the command was rewritten in C. + * "git merge-tree" used to mishandle "both sides added" conflict with + its own "create a fake ancestor file that has the common parts of + what both sides have added and do a 3-way merge" logic; this has + been updated to use the usual "3-way merge with an empty blob as + the fake common ancestor file" approach used in the rest of the + system. + * The documentation did not clearly state that the 'simple' mode is + now the default for "git push" when push.default configuration is + not set. + * Test adjustments for GNU grep, obsoleting + git-2.7.1-fix-tests-grep-2.23.patch + * "git config section.var value" to set a value in per-repository + configuration file failed when it was run outside any repository, + but didn't say the reason correctly. + ------------------------------------------------------------------- Tue Feb 23 10:14:22 UTC 2016 - astieger@suse.com diff --git a/git.spec b/git.spec index d770dab..6991f4e 100644 --- a/git.spec +++ b/git.spec @@ -26,7 +26,7 @@ %endif Name: git -Version: 2.7.2 +Version: 2.7.3 Release: 0 Summary: Fast, scalable, distributed revision control system License: GPL-2.0 @@ -51,7 +51,6 @@ 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 @@ -242,7 +241,6 @@ directory /git/ that calls the cgi script. %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p1 %build cat > .make <<'EOF'