mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-19 18:44:08 +01:00
Code

Merge branch 'svn-fe' of git://repo.or.cz/git/jrn

Browse Source 
* 'svn-fe' of git://repo.or.cz/git/jrn:
  tests: kill backgrounded processes more robustly
  vcs-svn: a void function shouldn't try to return something
  tests: make sure input to sed is newline terminated
  vcs-svn: add missing cast to printf argument
This commit is contained in:
Junio C Hamano 2011-03-30 10:49:13 -07:00
commit 44a9cedb00
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
t/t0081-line-buffer.sh
View File

@ -47,10 +47,10 @@ long_read_test () {
rm -f input &&
mkfifo input &&
{
{
(
generate_tens_of_lines $tens_of_lines "$line" &&
sleep 100
} >input &
exec sleep 100
) >input &
} &&
test-line-buffer input <<-EOF >output &&
binary $readsize
@ -109,11 +109,11 @@ test_expect_success PIPE '1-byte read, no input available' '
rm -f input &&
mkfifo input &&
{
{
(
printf "%s" a &&
printf "%s" b &&
sleep 100
} >input &
exec sleep 100
) >input &
} &&
test-line-buffer input <<-\EOF >actual &&
binary 1

8
t/t9010-svn-fe.sh
View File

@ -407,7 +407,7 @@ test_expect_success 'NUL in log message, file content, and property name' '
OBJID
:000000 100644 OBJID OBJID A greeting
EOF
printf "\n%s" "something with an ASCII NUL (Q)" >expect.message &&
printf "\n%s\n" "something with an ASCII NUL (Q)" >expect.message &&
printf "%s\n" "helQo" >expect.hello1 &&
printf "%s\n" "link hello" >expect.hello2 &&
{
@ -465,7 +465,11 @@ test_expect_success 'NUL in log message, file content, and property name' '
git diff-tree --root --stdin |
sed "s/$_x40/OBJID/g"
} >actual &&
git cat-file commit HEAD | nul_to_q | sed -ne "/^\$/,\$ p" >actual.message &&
{
git cat-file commit HEAD | nul_to_q &&
echo
} |
sed -ne "/^\$/,\$ p" >actual.message &&
git cat-file blob HEAD^:greeting | nul_to_q >actual.hello1 &&
git cat-file blob HEAD:greeting | nul_to_q >actual.hello2 &&
test_cmp expect actual &&

3
vcs-svn/svndump.c
View File

@ -214,7 +214,8 @@ static void handle_node(void)
if (have_text || have_props || node_ctx.srcRev)
die("invalid dump: deletion node has "
"copyfrom info, text, or properties");
return repo_delete(node_ctx.dst);
repo_delete(node_ctx.dst);
return;
}
if (node_ctx.action == NODEACT_REPLACE) {
repo_delete(node_ctx.dst);