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

* '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

diff --git a/t/t0081-line-buffer.sh b/t/t0081-line-buffer.sh
index 1dbe1c9b08c1d5140bf237bfee2a02cf4831d261..5067d1e15b566721c1a3ae79052cbcb023a03656 100755 (executable)
--- a/t/t0081-line-buffer.sh
+++ b/t/t0081-line-buffer.sh
@@ -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

diff --git a/t/t9010-svn-fe.sh b/t/t9010-svn-fe.sh
index 478c860647b78518820cd244042584131c485914..6f6175a8f7d9b0c6e6334f89ff21b74f067d6532 100755 (executable)
--- a/t/t9010-svn-fe.sh
+++ b/t/t9010-svn-fe.sh
@@ -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 &&

diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c
index eef49ca1928d21f7bb0d038693fd92c2a6e5ac85..572a99596657b85cbda372a9107a43c6c2fb44b2 100644 (file)
--- a/vcs-svn/svndump.c
+++ b/vcs-svn/svndump.c
@@ -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);