From: Michael J Gruber <git@drmicha•warpmail.net>
To: unlisted-recipients:; (no To-header on input)
Cc: Junio C Hamano <gitster@pobox•com>,
Clemens Buchacher <drizzd@aon•at>,
git@vger•kernel.org, tobiasu@tmux•org
Subject: Re: [PATCH 3/3] push: old receive-pack does not understand --quiet
Date: Mon, 05 Sep 2011 16:17:46 +0200 [thread overview]
Message-ID: <4E64DA0A.8090202@drmicha.warpmail.net> (raw)
In-Reply-To: <4E6494F7.7010101@drmicha.warpmail.net>
Michael J Gruber venit, vidit, dixit 05.09.2011 11:23:
> Junio C Hamano venit, vidit, dixit 05.09.2011 10:35:
>> Hmm, with this whole series merged to 'pu', I somehow am getting this
>> error:
>>
>> $ make -j8 \
>> DEFAULT_TEST_TARGET=prove \
>> GIT_PROVE_OPTS=-j8 \
>> T=t5541-http-push.sh test
>> *** prove ***
>> t5541-http-push.sh .. All 1 subtests passed
>>
>> Test Summary Report
>> -------------------
>> t5541-http-push.sh (Wstat: 0 Tests: 1 Failed: 0)
>> Parse errors: No plan found in TAP output
>> Files=1, Tests=1, 0 wallclock secs ( 0.02 usr 0.00 sys + 0.06 cusr 0.01 csys = 0.09 CPU)
>> Result: FAIL
>> make[1]: *** [prove] Error 1
>> make[1]: Leaving directory `/srv/project/git/git.git/t'
>> make: *** [test] Error 2
>>
>> Without prove (drop "DEFAULT_TEST_TARGET=prove" from the command line),
>> I do not see the breakage.
>>
>> *** t5541-http-push.sh ***
>> ok 1 - set up terminal for tests
>> # passed all 1 test(s)
>> 1..1 # SKIP Network testing disabled (define GIT_TEST_HTTPD to enable)
>> make aggregate-results
>> make[3]: Entering directory `/srv/project/git/git.git/t'
>> for f in test-results/t*-*.counts; do \
>> echo "$f"; \
>> done | '/bin/sh' ./aggregate-results.sh
>> fixed 0
>> success 1
>> failed 0
>> broken 0
>> total 1
>>
>
> Being cc'ed makes me feel guilty but I don't know what for... Anyway, in
> case you need more test points, with pu at v1.7.7-rc0-315-g55af6ac and
> prove I get:
>
> *** prove ***
> t5541-http-push.sh .. skipped: Network testing disabled (define
> GIT_TEST_HTTPD to enable)
> Files=1, Tests=0, 0 wallclock secs ( 0.04 usr 0.01 sys + 0.00 cusr
> 0.02 csys = 0.07 CPU)
> Result: NOTESTS
>
> Patch 3/3 does not apply (am) to pu but leaves neither changes nor
> conflicts in my wt. -3 gives a conflict which I don't know how to
> resolve without digging further, see below.
>
> Michael
>
> The conflict in send-pack.c is simple, but what about:
...
OK, I resolved this now, and am getting the same error as you, and am
stumped. But for me, 1/3 introduces that problem already. In fact, the hunk
--- a/t/t5541-http-push.sh
+++ b/t/t5541-http-push.sh
@@ -5,6 +5,7 @@
test_description='test smart pushing over http via http-backend'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-terminal.sh
suffices to trigger the problem. The test run in lib-terminal increases
the count but the output is lost. Patch upcoming.
Michael
next prev parent reply other threads:[~2011-09-05 14:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-03 10:57 [BUG] git push --quiet fails with older versions Tobias Ulmer
2011-09-03 16:34 ` Clemens Buchacher
2011-09-03 16:34 ` [PATCH 1/3] tests for push --quiet Clemens Buchacher
2011-09-03 16:34 ` [PATCH 2/3] fix push --quiet via http Clemens Buchacher
2011-09-03 16:34 ` [PATCH 3/3] push: old receive-pack does not understand --quiet Clemens Buchacher
2011-09-05 2:28 ` Junio C Hamano
2011-09-05 3:01 ` Junio C Hamano
2011-09-05 8:35 ` Junio C Hamano
2011-09-05 9:23 ` Michael J Gruber
2011-09-05 14:17 ` Michael J Gruber [this message]
2011-09-05 14:24 ` [PATCH] t5541: avoid TAP test miscounting Michael J Gruber
2011-09-05 19:34 ` [PATCH 3/3] push: old receive-pack does not understand --quiet Junio C Hamano
2011-09-06 6:03 ` Michael J Gruber
2011-09-06 18:01 ` Junio C Hamano
2011-09-06 19:52 ` Clemens Buchacher
2011-09-04 12:08 ` [BUG] git push --quiet fails with older versions Tobias Ulmer
2011-09-04 19:02 ` Junio C Hamano
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=4E64DA0A.8090202@drmicha.warpmail.net \
--to=git@drmicha$(echo .)warpmail.net \
--cc=drizzd@aon$(echo .)at \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=tobiasu@tmux$(echo .)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