git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dennis Stosberg <dennis@stosberg.net>
To: Michael Somos <somos@grail.cba.csuohio.edu>
Cc: rene.scharfe@lsrfire.ath.cx, git@vger.kernel.org
Subject: Re: git-1.4.0 make problems
Date: Sat, 17 Jun 2006 15:09:58 +0200	[thread overview]
Message-ID: <20060617130957.G199de590@leonov.stosberg.net> (raw)
In-Reply-To: <200606171016.k5HAGQ1D005560@grail.cba.csuohio.edu>

Michael Somos wrote:

> A good suggestion, but I am a newbie as you can tell, and would prefer to
> play in a sandbox for some time before I would attempt it. Of more concern
> to me now is a failed test :
> 
> > * FAIL 12: apply diff between 3 and 2
> >        git-apply <diff.3-2 && diff frotz.2 frotz
> > * failed 2 among 12 test(s)
> > make[1]: *** [t4101-apply-nonl.sh] Error 1

I have seen this test failing on FreeBSD 5.3, too.  FreeBSD comes with a
version of "diff" which does not add the "\ No newline at end of file"
remark.  Maybe your "diff" is simply too old.  In that case, it's not a
serious problem because Git uses its own internal diff implementation.

The intention of this test is to test git-apply and not the system's
"diff", so perhaps it should bring along all its patches and not rely
on the system's "diff" to generate them...

Regards,
Dennis

  reply	other threads:[~2006-06-17 13:10 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-06-17 10:16 git-1.4.0 make problems Michael Somos
2006-06-17 13:09 ` Dennis Stosberg [this message]
2006-06-17 14:46   ` Michael Somos
2006-06-17 15:02     ` [PATCH] Make t4101-apply-nonl bring along its patches Dennis Stosberg
2006-06-17 22:11 ` git-1.4.0 make problems Rene Scharfe
  -- strict thread matches above, loose matches on Subject: below --
2006-06-17  2:18 Michael Somos
2006-06-17  6:58 ` Rene Scharfe
2006-06-17 20:56   ` Junio C Hamano
2006-06-17 21:55     ` Rene Scharfe
2006-06-17 22:40       ` 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=20060617130957.G199de590@leonov.stosberg.net \
    --to=dennis@stosberg.net \
    --cc=git@vger.kernel.org \
    --cc=rene.scharfe@lsrfire.ath.cx \
    --cc=somos@grail.cba.csuohio.edu \
    /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).