Thread (7 messages) 7 messages, 4 authors, 2016-06-15

Re: 195b7ca6 breaks t9010 at current master

From: Jonathan Nieder <hidden>
Date: 2016-06-15 22:50:57

Hi,

Brandon Casey wrote:
quoted hunk ↗ jump to hunk
I was just about to send a patch for this, when I noticed it has
already been worked around in master by the above.

I'll still share my one-liner for informational purposes which uses perl
and in my opinion is a little simpler:
--- a/t/t9010-svn-fe.sh
+++ b/t/t9010-svn-fe.sh
@@ -465,7 +465,7 @@ 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 | perl -ne "print if (/^$/..eof())" >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 &&
Thanks.  I'll definitely use that idiom the next time this sed gotcha
comes up.

Also if you're interested, I'd be happy to take a patch on top to
make it so as a cleanup (probably splitting the line at the same time,
since it's getting pretty long).
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help