Sync with 1.7.5.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
commit
1dcfb2ac65
32
Documentation/RelNotes/1.7.5.3.txt
Normal file
32
Documentation/RelNotes/1.7.5.3.txt
Normal file
@ -0,0 +1,32 @@
|
||||
Git v1.7.5.3 Release Notes
|
||||
==========================
|
||||
|
||||
Fixes since v1.7.5.2
|
||||
--------------------
|
||||
|
||||
* The bash completion scripts should correctly work using zsh's bash
|
||||
completion emulation layer now.
|
||||
|
||||
* Setting $(prefix) in config.mak did not affect where etc/gitconfig
|
||||
file is read from, even though passing it from the command line of
|
||||
$(MAKE) did.
|
||||
|
||||
* The logic to handle "&" (expand to UNIX username) in GECOS field
|
||||
miscounted the length of the name it formatted.
|
||||
|
||||
* "git cherry-pick -s resolve" failed to cherry-pick a root commit.
|
||||
|
||||
* "git diff --word-diff" misbehaved when diff.suppress-blank-empty was
|
||||
in effect.
|
||||
|
||||
* "git log --stdin path" with an input that has additional pathspec
|
||||
used to corrupt memory.
|
||||
|
||||
* "git send-pack" (hence "git push") over smalt-HTTP protocol could
|
||||
deadlock when the client side pack-object died early.
|
||||
|
||||
* Compressed tarball gitweb generates used to be made with the timestamp
|
||||
of the tarball generation; this was bad because snapshot from the same
|
||||
tree should result in a same tarball.
|
||||
|
||||
And other minor fixes and documentation updates.
|
||||
@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
|
||||
branch of the `git.git` repository.
|
||||
Documentation for older releases are available here:
|
||||
|
||||
* link:v1.7.5.2/git.html[documentation for release 1.7.5.2]
|
||||
* link:v1.7.5.3/git.html[documentation for release 1.7.5.3]
|
||||
|
||||
* release notes for
|
||||
link:RelNotes/1.7.5.3.txt[1.7.5.3],
|
||||
link:RelNotes/1.7.5.2.txt[1.7.5.2],
|
||||
link:RelNotes/1.7.5.1.txt[1.7.5.1],
|
||||
link:RelNotes/1.7.5.txt[1.7.5].
|
||||
|
||||
@ -2,74 +2,14 @@
|
||||
|
||||
test_description="Test the svn importer's input handling routines.
|
||||
|
||||
These tests exercise the line_buffer library, but their real purpose
|
||||
is to check the assumptions that library makes of the platform's input
|
||||
routines. Processes engaged in bi-directional communication would
|
||||
hang if fread or fgets is too greedy.
|
||||
These tests provide some simple checks that the line_buffer API
|
||||
behaves as advertised.
|
||||
|
||||
While at it, check that input of newlines and null bytes are handled
|
||||
correctly.
|
||||
"
|
||||
. ./test-lib.sh
|
||||
|
||||
test -n "$GIT_REMOTE_SVN_TEST_BIG_FILES" && test_set_prereq EXPENSIVE
|
||||
|
||||
generate_tens_of_lines () {
|
||||
tens=$1 &&
|
||||
line=$2 &&
|
||||
|
||||
i=0 &&
|
||||
while test $i -lt "$tens"
|
||||
do
|
||||
for j in a b c d e f g h i j
|
||||
do
|
||||
echo "$line"
|
||||
done &&
|
||||
: $((i = $i + 1)) ||
|
||||
return
|
||||
done
|
||||
}
|
||||
|
||||
long_read_test () {
|
||||
: each line is 10 bytes, including newline &&
|
||||
line=abcdefghi &&
|
||||
echo "$line" >expect &&
|
||||
|
||||
if ! test_declared_prereq PIPE
|
||||
then
|
||||
echo >&4 "long_read_test: need to declare PIPE prerequisite"
|
||||
return 127
|
||||
fi &&
|
||||
tens_of_lines=$(($1 / 100 + 1)) &&
|
||||
lines=$(($tens_of_lines * 10)) &&
|
||||
readsize=$((($lines - 1) * 10 + 3)) &&
|
||||
copysize=7 &&
|
||||
rm -f input &&
|
||||
mkfifo input &&
|
||||
{
|
||||
(
|
||||
generate_tens_of_lines $tens_of_lines "$line" &&
|
||||
exec sleep 100
|
||||
) >input &
|
||||
} &&
|
||||
test-line-buffer input <<-EOF >output &&
|
||||
binary $readsize
|
||||
copy $copysize
|
||||
EOF
|
||||
kill $! &&
|
||||
test_line_count = $lines output &&
|
||||
tail -n 1 <output >actual &&
|
||||
test_cmp expect actual
|
||||
}
|
||||
|
||||
test_expect_success 'setup: have pipes?' '
|
||||
rm -f frob &&
|
||||
if mkfifo frob
|
||||
then
|
||||
test_set_prereq PIPE
|
||||
fi
|
||||
'
|
||||
|
||||
test_expect_success 'hello world' '
|
||||
echo ">HELLO" >expect &&
|
||||
test-line-buffer <<-\EOF >actual &&
|
||||
@ -79,21 +19,6 @@ test_expect_success 'hello world' '
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success PIPE '0-length read, no input available' '
|
||||
printf ">" >expect &&
|
||||
rm -f input &&
|
||||
mkfifo input &&
|
||||
{
|
||||
sleep 100 >input &
|
||||
} &&
|
||||
test-line-buffer input <<-\EOF >actual &&
|
||||
binary 0
|
||||
copy 0
|
||||
EOF
|
||||
kill $! &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success '0-length read, send along greeting' '
|
||||
echo ">HELLO" >expect &&
|
||||
test-line-buffer <<-\EOF >actual &&
|
||||
@ -104,33 +29,6 @@ test_expect_success '0-length read, send along greeting' '
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success PIPE '1-byte read, no input available' '
|
||||
printf ">%s" ab >expect &&
|
||||
rm -f input &&
|
||||
mkfifo input &&
|
||||
{
|
||||
(
|
||||
printf "%s" a &&
|
||||
printf "%s" b &&
|
||||
exec sleep 100
|
||||
) >input &
|
||||
} &&
|
||||
test-line-buffer input <<-\EOF >actual &&
|
||||
binary 1
|
||||
copy 1
|
||||
EOF
|
||||
kill $! &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success PIPE 'long read (around 8192 bytes)' '
|
||||
long_read_test 8192
|
||||
'
|
||||
|
||||
test_expect_success PIPE,EXPENSIVE 'longer read (around 65536 bytes)' '
|
||||
long_read_test 65536
|
||||
'
|
||||
|
||||
test_expect_success 'read from file descriptor' '
|
||||
rm -f input &&
|
||||
echo hello >expect &&
|
||||
|
||||
Loading…
Reference in New Issue
Block a user