From 13cb3bb7e6e69fbd82db460f1d23ccb2111e8b63 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Tue, 9 Apr 2013 23:48:36 +0200 Subject: [PATCH 1/4] t/README: --immediate skips cleanup commands for failed tests Signed-off-by: Simon Ruderich Signed-off-by: Junio C Hamano --- t/README | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/t/README b/t/README index e4128e5769..6e536a02b5 100644 --- a/t/README +++ b/t/README @@ -86,7 +86,10 @@ appropriately before running "make". --immediate:: This causes the test to immediately exit upon the first - failed test. + failed test. Cleanup commands requested with + test_when_finished are not executed if the test failed, + in order to keep the state for inspection by the tester + to diagnose the bug. --long-tests:: This causes additional long-running tests to be run (where From 59a7714c8909f1a925a7faa4f3015f015c087ee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Scharfe?= Date: Wed, 10 Apr 2013 19:49:57 +0200 Subject: [PATCH 2/4] archive: clarify explanation of --worktree-attributes Make it a bit clearer that --worktree-attributes is about files in the working tree (checked out files, possibly changed) and not the current working directory ($PWD). Link to the ATTRIBUTES section, which has more details. Reported-by: Amit Bakshi Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- Documentation/git-archive.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt index b4c2e24849..250e5228a3 100644 --- a/Documentation/git-archive.txt +++ b/Documentation/git-archive.txt @@ -56,7 +56,8 @@ OPTIONS Write the archive to instead of stdout. --worktree-attributes:: - Look for attributes in .gitattributes in working directory too. + Look for attributes in .gitattributes files in the working tree + as well (see <>). :: This can be any options that the archiver backend understands. @@ -120,6 +121,7 @@ tar..remote:: user-defined formats, but true for the "tar.gz" and "tgz" formats. +[[ATTRIBUTES]] ATTRIBUTES ---------- From 200732744a32a378b636da4d840aeb410adfb2ad Mon Sep 17 00:00:00 2001 From: Adam Spiers Date: Thu, 11 Apr 2013 03:07:04 +0100 Subject: [PATCH 3/4] t: make PIPE a standard test prerequisite The 'PIPE' test prerequisite was already defined identically by t9010 and t9300, therefore it makes sense to make it a predefined prerequisite. Signed-off-by: Adam Spiers Signed-off-by: Junio C Hamano --- t/README | 5 +++++ t/t9010-svn-fe.sh | 8 -------- t/t9300-fast-import.sh | 8 -------- t/test-lib.sh | 5 +++++ 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/t/README b/t/README index 6e536a02b5..f8bf3ec318 100644 --- a/t/README +++ b/t/README @@ -613,6 +613,11 @@ use these, and "test_set_prereq" for how to define your own. The process retains the same pid across exec(2). See fb9a2bea for details. + - PIPE + + The filesystem we're on supports creation of FIFOs (named pipes) + via mkfifo(1). + - SYMLINKS The filesystem we're on supports symbolic links. E.g. a FAT diff --git a/t/t9010-svn-fe.sh b/t/t9010-svn-fe.sh index b7eed2489f..6dafe7e99a 100755 --- a/t/t9010-svn-fe.sh +++ b/t/t9010-svn-fe.sh @@ -54,14 +54,6 @@ text_no_props () { >empty -test_expect_success 'setup: have pipes?' ' - rm -f frob && - if mkfifo frob - then - test_set_prereq PIPE - fi -' - test_expect_success PIPE 'empty dump' ' reinit_git && echo "SVN-fs-dump-format-version: 2" >input && diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 2fcf269469..ac6f3b6af2 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -49,14 +49,6 @@ echo "$@"' >empty -test_expect_success 'setup: have pipes?' ' - rm -f frob && - if mkfifo frob - then - test_set_prereq PIPE - fi -' - ### ### series A ### diff --git a/t/test-lib.sh b/t/test-lib.sh index 1f510252ad..8d76cf23d4 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -727,6 +727,11 @@ test_i18ngrep () { fi } +test_lazy_prereq PIPE ' + # test whether the filesystem supports FIFOs + rm -f testfifo && mkfifo testfifo +' + test_lazy_prereq SYMLINKS ' # test whether the filesystem supports symbolic links ln -s x y && test -h y From 3a51467b94306e77c1b69b374bac33b6672bc177 Mon Sep 17 00:00:00 2001 From: Benoit Bourbie Date: Sat, 13 Apr 2013 10:47:21 -0600 Subject: [PATCH 4/4] Typo fix: replacing it's -> its Signed-off-by: Benoit Bourbie Signed-off-by: Junio C Hamano --- INSTALL | 2 +- perl/private-Error.pm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/INSTALL b/INSTALL index 2dc3b61d1f..ba01e7421e 100644 --- a/INSTALL +++ b/INSTALL @@ -101,7 +101,7 @@ Issues of note: - "openssl" library is used by git-imap-send to use IMAP over SSL. If you don't need it, use NO_OPENSSL. - By default, git uses OpenSSL for SHA1 but it will use it's own + By default, git uses OpenSSL for SHA1 but it will use its own library (inspired by Mozilla's) with either NO_OPENSSL or BLK_SHA1. Also included is a version optimized for PowerPC (PPC_SHA1). diff --git a/perl/private-Error.pm b/perl/private-Error.pm index 11e9cd9a02..ea14ab270a 100644 --- a/perl/private-Error.pm +++ b/perl/private-Error.pm @@ -630,7 +630,7 @@ =head1 CLASS INTERFACE =head2 CONSTRUCTORS The C object is implemented as a HASH. This HASH is initialized -with the arguments that are passed to it's constructor. The elements +with the arguments that are passed to its constructor. The elements that are used by, or are retrievable by the C class are listed below, other classes may add to these. @@ -763,7 +763,7 @@ =head1 PRE-DEFINED ERROR CLASSES =item Error::Simple -This class can be used to hold simple error strings and values. It's +This class can be used to hold simple error strings and values. Its constructor takes two arguments. The first is a text value, the second is a numeric value. These values are what will be returned by the overload methods.