From: Junio C Hamano <gitster@pobox•com>
To: David Turner <dturner@twopensource•com>
Cc: git@vger•kernel.org
Subject: Re: What's cooking in git.git
Date: Fri, 07 Aug 2015 09:40:06 -0700 [thread overview]
Message-ID: <xmqqh9obyrvd.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <xmqqk2t91e5y.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Wed, 05 Aug 2015 16:58:01 -0700")
Junio C Hamano <gitster@pobox•com> writes:
> David Turner <dturner@twopensource•com> writes:
>
>> On Wed, 2015-08-05 at 15:55 -0700, Junio C Hamano wrote:
>>> * dt/untracked-subdir (2015-08-05) 2 commits
>>> - DONTMERGE: Waiting for an Ack from Duy
>>> - untracked-cache: fix subdirectory handling
>>> (this branch uses dt/untracked-sparse.)
>>>
>>> This seems to break some tests.
>>
>> All tests pass for me locally. What's broken for you?
>
> *** prove ***
> t7063-status-untracked-cache.sh .. Dubious, test returned 1 (wstat 256, 0x100)
> Failed 3/30 subtests
>
> Test Summary Report
> -------------------
> t7063-status-untracked-cache.sh (Wstat: 256 Tests: 30 Failed: 3)
> Failed tests: 28-30
> Non-zero exit status: 1
> Files=1, Tests=30, 27 wallclock secs ( 0.04 usr 0.01 sys + 0.15 cusr 0.67 csys = 0.87 CPU)
> Result: FAIL
So it turns out that you run "strace -k -o /tmp/tr" and never look
at /tmp/tr; I am guessing that this was a remnant of your debugging
while developing the test, sign of lack of proofreading before
sending the patch out, perhaps?
I didn't carefully read the remainder of the patch, but at the
minimum this needs to be squashed in. They may be a reroll with
some more tweaks from you after other people comment on it, so I'll
keep this separate and squashable.
Thanks.
t/t7063-status-untracked-cache.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t7063-status-untracked-cache.sh b/t/t7063-status-untracked-cache.sh
index bb0e2a9..ca8dc3a 100755
--- a/t/t7063-status-untracked-cache.sh
+++ b/t/t7063-status-untracked-cache.sh
@@ -486,7 +486,7 @@ test_expect_success 'test sparse status with untracked cache and subdir' '
avoid_racy &&
: >../trace &&
GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \
- strace -k -o /tmp/st git status --porcelain >../status.actual &&
+ git status --porcelain >../status.actual &&
cat >../status.expect <<EOF &&
M done/two
?? .gitignore
next prev parent reply other threads:[~2015-08-07 16:40 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-05 22:55 What's cooking in git.git Junio C Hamano
2015-08-05 23:14 ` David Turner
2015-08-05 23:58 ` Junio C Hamano
2015-08-07 16:40 ` Junio C Hamano [this message]
2015-08-06 4:55 ` Jeff King
2015-08-06 5:29 ` [PATCH 0/2] ./t5512-*.sh -x complaints Jeff King
2015-08-06 5:31 ` [PATCH 1/2] test-lib: turn off "-x" tracing during chain-lint check Jeff King
2015-08-06 5:33 ` [PATCH 2/2] test-lib: disable trace when test is not verbose Jeff King
2015-08-07 18:47 ` What's cooking in git.git Junio C Hamano
2015-08-06 10:19 ` Johannes Schindelin
-- strict thread matches above, loose matches on Subject: below --
2006-12-13 21:38 Junio C Hamano
2006-01-12 0:04 Junio C Hamano
2006-01-14 3:45 ` Junio C Hamano
2006-01-16 10:53 ` Petr Baudis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqh9obyrvd.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=dturner@twopensource$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox