[arch-commits] Commit in git/trunk (3 files)
Dan McGee
dan at archlinux.org
Sat Mar 12 21:13:04 UTC 2016
Date: Saturday, March 12, 2016 @ 22:13:04
Author: dan
Revision: 261387
upgpkg: git 2.7.3-1
Modified:
git/trunk/PKGBUILD
Deleted:
git/trunk/0001-t8005-avoid-grep-on-non-ASCII-data.patch
git/trunk/0001-t9200-avoid-grep-on-non-ASCII-data.patch
-----------------------------------------------+
0001-t8005-avoid-grep-on-non-ASCII-data.patch | 88 ------------------------
0001-t9200-avoid-grep-on-non-ASCII-data.patch | 33 ---------
PKGBUILD | 20 +----
3 files changed, 5 insertions(+), 136 deletions(-)
Deleted: 0001-t8005-avoid-grep-on-non-ASCII-data.patch
===================================================================
--- 0001-t8005-avoid-grep-on-non-ASCII-data.patch 2016-03-12 18:47:21 UTC (rev 261386)
+++ 0001-t8005-avoid-grep-on-non-ASCII-data.patch 2016-03-12 21:13:04 UTC (rev 261387)
@@ -1,88 +0,0 @@
-From 0be43dedbc03139b9d9d0bc71deefc4d7f47296d Mon Sep 17 00:00:00 2001
-From: John Keeping <john at keeping.me.uk>
-Date: Sun, 21 Feb 2016 17:32:21 +0000
-Subject: [PATCH] t8005: avoid grep on non-ASCII data
-
-GNU grep 2.23 detects the input used in this test as binary data so it
-does not work for extracting lines from a file. We could add the "-a"
-option to force grep to treat the input as text, but not all
-implementations support that. Instead, use sed to extract the desired
-lines since it will always treat its input as text.
-
-While touching these lines, modernize the test style to avoid hiding the
-exit status of "git blame" and remove a space following a redirection
-operator. Also swap the order of the expected and actual output
-files given to test_cmp; we compare expect and actual to show how
-actual output differs from what is expected.
-
-Signed-off-by: John Keeping <john at keeping.me.uk>
-Signed-off-by: Junio C Hamano <gitster at pobox.com>
----
- t/t8005-blame-i18n.sh | 28 ++++++++++++++++------------
- 1 file changed, 16 insertions(+), 12 deletions(-)
-
-diff --git a/t/t8005-blame-i18n.sh b/t/t8005-blame-i18n.sh
-index 847d098..75da219 100755
---- a/t/t8005-blame-i18n.sh
-+++ b/t/t8005-blame-i18n.sh
-@@ -33,11 +33,15 @@ author $SJIS_NAME
- summary $SJIS_MSG
- EOF
-
-+filter_author_summary () {
-+ sed -n -e '/^author /p' -e '/^summary /p' "$@"
-+}
-+
- test_expect_success !MINGW \
- 'blame respects i18n.commitencoding' '
-- git blame --incremental file | \
-- egrep "^(author|summary) " > actual &&
-- test_cmp actual expected
-+ git blame --incremental file >output &&
-+ filter_author_summary output >actual &&
-+ test_cmp expected actual
- '
-
- cat >expected <<EOF
-@@ -52,9 +56,9 @@ EOF
- test_expect_success !MINGW \
- 'blame respects i18n.logoutputencoding' '
- git config i18n.logoutputencoding eucJP &&
-- git blame --incremental file | \
-- egrep "^(author|summary) " > actual &&
-- test_cmp actual expected
-+ git blame --incremental file >output &&
-+ filter_author_summary output >actual &&
-+ test_cmp expected actual
- '
-
- cat >expected <<EOF
-@@ -68,9 +72,9 @@ EOF
-
- test_expect_success !MINGW \
- 'blame respects --encoding=UTF-8' '
-- git blame --incremental --encoding=UTF-8 file | \
-- egrep "^(author|summary) " > actual &&
-- test_cmp actual expected
-+ git blame --incremental --encoding=UTF-8 file >output &&
-+ filter_author_summary output >actual &&
-+ test_cmp expected actual
- '
-
- cat >expected <<EOF
-@@ -84,9 +88,9 @@ EOF
-
- test_expect_success !MINGW \
- 'blame respects --encoding=none' '
-- git blame --incremental --encoding=none file | \
-- egrep "^(author|summary) " > actual &&
-- test_cmp actual expected
-+ git blame --incremental --encoding=none file >output &&
-+ filter_author_summary output >actual &&
-+ test_cmp expected actual
- '
-
- test_done
---
-2.7.1
-
Deleted: 0001-t9200-avoid-grep-on-non-ASCII-data.patch
===================================================================
--- 0001-t9200-avoid-grep-on-non-ASCII-data.patch 2016-03-12 18:47:21 UTC (rev 261386)
+++ 0001-t9200-avoid-grep-on-non-ASCII-data.patch 2016-03-12 21:13:04 UTC (rev 261387)
@@ -1,33 +0,0 @@
-From 3b1442d5d23577ed3570023d338cd12298b16867 Mon Sep 17 00:00:00 2001
-From: John Keeping <john at keeping.me.uk>
-Date: Sun, 21 Feb 2016 17:32:22 +0000
-Subject: [PATCH] t9200: avoid grep on non-ASCII data
-
-GNU grep 2.23 detects the input used in this test as binary data so it
-does not work for extracting lines from a file. We could add the "-a"
-option to force grep to treat the input as text, but not all
-implementations support that. Instead, use sed to extract the desired
-lines since it will always treat its input as text.
-
-Signed-off-by: John Keeping <john at keeping.me.uk>
-Signed-off-by: Junio C Hamano <gitster at pobox.com>
----
- t/t9200-git-cvsexportcommit.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
-index 812c9cd..7117719 100755
---- a/t/t9200-git-cvsexportcommit.sh
-+++ b/t/t9200-git-cvsexportcommit.sh
-@@ -35,7 +35,7 @@ exit 1
-
- check_entries () {
- # $1 == directory, $2 == expected
-- grep '^/' "$1/CVS/Entries" | sort | cut -d/ -f2,3,5 >actual
-+ sed -ne '/^\//p' "$1/CVS/Entries" | sort | cut -d/ -f2,3,5 >actual
- if test -z "$2"
- then
- >expected
---
-2.7.1
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-03-12 18:47:21 UTC (rev 261386)
+++ PKGBUILD 2016-03-12 21:13:04 UTC (rev 261387)
@@ -2,8 +2,8 @@
# Maintainer: Dan McGee <dan at archlinux.org>
pkgname=git
-pkgver=2.7.2
-pkgrel=2
+pkgver=2.7.3
+pkgrel=1
pkgdesc="the fast distributed version control system"
arch=(i686 x86_64)
url="http://git-scm.com/"
@@ -26,23 +26,13 @@
source=("https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz"
"https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.sign"
git-daemon at .service
- git-daemon.socket
- 0001-t8005-avoid-grep-on-non-ASCII-data.patch
- 0001-t9200-avoid-grep-on-non-ASCII-data.patch)
-md5sums=('b14189d9d9ea32274e51c7a4240ffc15'
+ git-daemon.socket)
+md5sums=('bb01710b1b24789a53c800a90c73957f'
'SKIP'
'042524f942785772d7bd52a1f02fe5ae'
- 'f67869315c2cc112e076f0c73f248002'
- '962d0aefc0d1e8988de4cadc64dfb4c0'
- '8ca170a285fa030f6eb629b5c67c16bd')
+ 'f67869315c2cc112e076f0c73f248002')
validpgpkeys=('96E07AF25771955980DAD10020D04E5A713660A7') # Junio C Hamano
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
- patch -Np1 < "$srcdir/0001-t8005-avoid-grep-on-non-ASCII-data.patch"
- patch -Np1 < "$srcdir/0001-t9200-avoid-grep-on-non-ASCII-data.patch"
-}
-
build() {
export PYTHON_PATH='/usr/bin/python2'
cd "$srcdir/$pkgname-$pkgver"
More information about the arch-commits
mailing list