mirror of
https://github.com/git/git
synced 2024-09-17 23:41:33 +00:00
Merge branch 'maint'
* maint: Typo fix: replacing it's -> its t: make PIPE a standard test prerequisite archive: clarify explanation of --worktree-attributes t/README: --immediate skips cleanup commands for failed tests
This commit is contained in:
commit
e2af9e361b
|
@ -56,7 +56,8 @@ OPTIONS
|
||||||
Write the archive to <file> instead of stdout.
|
Write the archive to <file> instead of stdout.
|
||||||
|
|
||||||
--worktree-attributes::
|
--worktree-attributes::
|
||||||
Look for attributes in .gitattributes in working directory too.
|
Look for attributes in .gitattributes files in the working tree
|
||||||
|
as well (see <<ATTRIBUTES>>).
|
||||||
|
|
||||||
<extra>::
|
<extra>::
|
||||||
This can be any options that the archiver backend understands.
|
This can be any options that the archiver backend understands.
|
||||||
|
@ -120,6 +121,7 @@ tar.<format>.remote::
|
||||||
user-defined formats, but true for the "tar.gz" and "tgz"
|
user-defined formats, but true for the "tar.gz" and "tgz"
|
||||||
formats.
|
formats.
|
||||||
|
|
||||||
|
[[ATTRIBUTES]]
|
||||||
ATTRIBUTES
|
ATTRIBUTES
|
||||||
----------
|
----------
|
||||||
|
|
||||||
|
|
2
INSTALL
2
INSTALL
|
@ -101,7 +101,7 @@ Issues of note:
|
||||||
- "openssl" library is used by git-imap-send to use IMAP over SSL.
|
- "openssl" library is used by git-imap-send to use IMAP over SSL.
|
||||||
If you don't need it, use NO_OPENSSL.
|
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
|
library (inspired by Mozilla's) with either NO_OPENSSL or
|
||||||
BLK_SHA1. Also included is a version optimized for PowerPC
|
BLK_SHA1. Also included is a version optimized for PowerPC
|
||||||
(PPC_SHA1).
|
(PPC_SHA1).
|
||||||
|
|
|
@ -630,7 +630,7 @@ =head1 CLASS INTERFACE
|
||||||
=head2 CONSTRUCTORS
|
=head2 CONSTRUCTORS
|
||||||
|
|
||||||
The C<Error> object is implemented as a HASH. This HASH is initialized
|
The C<Error> 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<Error> class are listed
|
that are used by, or are retrievable by the C<Error> class are listed
|
||||||
below, other classes may add to these.
|
below, other classes may add to these.
|
||||||
|
|
||||||
|
@ -763,7 +763,7 @@ =head1 PRE-DEFINED ERROR CLASSES
|
||||||
|
|
||||||
=item Error::Simple
|
=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
|
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
|
is a numeric value. These values are what will be returned by the
|
||||||
overload methods.
|
overload methods.
|
||||||
|
|
10
t/README
10
t/README
|
@ -86,7 +86,10 @@ appropriately before running "make".
|
||||||
|
|
||||||
--immediate::
|
--immediate::
|
||||||
This causes the test to immediately exit upon the first
|
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::
|
--long-tests::
|
||||||
This causes additional long-running tests to be run (where
|
This causes additional long-running tests to be run (where
|
||||||
|
@ -619,6 +622,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
|
The process retains the same pid across exec(2). See fb9a2bea for
|
||||||
details.
|
details.
|
||||||
|
|
||||||
|
- PIPE
|
||||||
|
|
||||||
|
The filesystem we're on supports creation of FIFOs (named pipes)
|
||||||
|
via mkfifo(1).
|
||||||
|
|
||||||
- SYMLINKS
|
- SYMLINKS
|
||||||
|
|
||||||
The filesystem we're on supports symbolic links. E.g. a FAT
|
The filesystem we're on supports symbolic links. E.g. a FAT
|
||||||
|
|
|
@ -54,14 +54,6 @@ text_no_props () {
|
||||||
|
|
||||||
>empty
|
>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' '
|
test_expect_success PIPE 'empty dump' '
|
||||||
reinit_git &&
|
reinit_git &&
|
||||||
echo "SVN-fs-dump-format-version: 2" >input &&
|
echo "SVN-fs-dump-format-version: 2" >input &&
|
||||||
|
|
|
@ -49,14 +49,6 @@ echo "$@"'
|
||||||
|
|
||||||
>empty
|
>empty
|
||||||
|
|
||||||
test_expect_success 'setup: have pipes?' '
|
|
||||||
rm -f frob &&
|
|
||||||
if mkfifo frob
|
|
||||||
then
|
|
||||||
test_set_prereq PIPE
|
|
||||||
fi
|
|
||||||
'
|
|
||||||
|
|
||||||
###
|
###
|
||||||
### series A
|
### series A
|
||||||
###
|
###
|
||||||
|
|
|
@ -735,6 +735,11 @@ test_i18ngrep () {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
test_lazy_prereq PIPE '
|
||||||
|
# test whether the filesystem supports FIFOs
|
||||||
|
rm -f testfifo && mkfifo testfifo
|
||||||
|
'
|
||||||
|
|
||||||
test_lazy_prereq SYMLINKS '
|
test_lazy_prereq SYMLINKS '
|
||||||
# test whether the filesystem supports symbolic links
|
# test whether the filesystem supports symbolic links
|
||||||
ln -s x y && test -h y
|
ln -s x y && test -h y
|
||||||
|
|
Loading…
Reference in a new issue