Re: [PATCHv4 03/15] t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Oct 1, 2010, 10:27 UTC
Message-ID: <20101001102724.GB6816@burratino>
In-Reply-To: <7v8w2ko14p.fsf@alter.siamese.dyndns.org>

Junio C Hamano wrote:

> Elijah Newren <newren@gmail.com> writes:

Show 12 quoted lines

>> --- a/t/t1001-read-tree-m-2way.sh
>> +++ b/t/t1001-read-tree-m-2way.sh
>> @@ -98,8 +98,8 @@ test_expect_success \
>>       git checkout-index -u -f -q -a &&
>>       git update-index --add yomin &&
>>       read_tree_twoway $treeH $treeM &&
>> -     git ls-files --stage >4.out || return 1
>> -     git diff --no-index M.out 4.out >4diff.out
>> +     git ls-files --stage >4.out &&
>> +     test_might_fail git diff --no-index M.out 4.out >4diff.out &&
>
> Shouldn't this be must-fail, as we are expecting to see some differences?

I see you've fixed this up already.  Thanks.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.