From: Christopher Tiwald <christiwald@gmail.com>
To: Brian Gernhardt <brian@silverinsanity.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: non-fast-forward advice breaks tests on OS X
Date: Thu, 12 Apr 2012 10:00:49 -0400 [thread overview]
Message-ID: <20120412140049.GB367@gmail.com> (raw)
In-Reply-To: <20120412133701.GA367@gmail.com>
On Thu, Apr 12, 2012 at 09:37:01AM -0400, Christopher Tiwald wrote:
> On Thu, Apr 12, 2012 at 01:49:14AM -0400, Brian Gernhardt wrote:
> > After a break in regularly compiling git on my Mac 10.7.3 laptop, I had a few tests fail: t5540.15, t5541.{12,15}. All of these tests use test_i18ngrep to test the output of git-push for the string "To prevent you from losing history, non-fast-forward updates were rejected".
> >
> > Bisecting traced it back to f25950f: "push: Provide situational hints for non-fast-forward errors".
>
> I also run 10.7.3 on a MacBook Pro. I will investigate this now and see
> if I can get tests to break. I know the original patch passed the test
> suite on this machine.
Ah ha, I wasn't running the proper tests. I'll send a patch to the
affected ones later today.
*** t5540-http-push.sh ***
# passed all 0 test(s)
1..0 # SKIP Network testing disabled (define GIT_TEST_HTTPD to enable)
*** t5541-http-push.sh ***
# passed all 0 test(s)
1..0 # SKIP Network testing disabled (define GIT_TEST_HTTPD to enable)
*** t5550-http-fetch.sh ***
# passed all 0 test(s)
1..0 # SKIP Network testing disabled (define GIT_TEST_HTTPD to enable)
*** t5551-http-fetch.sh ***
# passed all 0 test(s)
1..0 # SKIP Network testing disabled (define GIT_TEST_HTTPD to enable)
next prev parent reply other threads:[~2012-04-12 14:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-12 5:49 non-fast-forward advice breaks tests on OS X Brian Gernhardt
2012-04-12 13:37 ` Christopher Tiwald
2012-04-12 14:00 ` Christopher Tiwald [this message]
2012-04-12 15:35 ` Junio C Hamano
2012-04-12 17:56 ` [PATCH] Fix httpd tests that broke when non-ff push advice changed Christopher Tiwald
2012-04-12 21:51 ` 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=20120412140049.GB367@gmail.com \
--to=christiwald@gmail.com \
--cc=brian@silverinsanity.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).