Junio C Hamano <[email protected]> writes:
> David Turner <[email protected]> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html