From: Shawn Pearce <spearce@spearce.org>
To: Stefan Pfetzing <stefan.pfetzing@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: t8001-annotate.sh fails on Mac OS X
Date: Thu, 25 May 2006 21:11:53 -0400 [thread overview]
Message-ID: <20060526011153.GA27720@spearce.org> (raw)
In-Reply-To: <f3d7535d0605251653m15db34f3j46403f4ed0c4c69f@mail.gmail.com>
Stefan Pfetzing <stefan.pfetzing@gmail.com> wrote:
> Hi,
>
> for some reason I could not yet figure out, t8001-annotate.sh fails at test
> 18.
>
> --- snip ---
> * ok 17: some edit
> * expecting success: check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1
> Author A (expected 1, attributed 1) good
> Author B1 (expected 1, attributed 1) good
> Author D (expected 1, attributed 2) bad
> Author A U Thor (expected 1, attributed 1) good
> Author B2 (expected 1, attributed 1) good
> Author B (expected 1, attributed 1) good
> * FAIL 18: some edit
> check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1
> * failed 1 among 18 test(s)
I've been seeing the same failed test case for a long time now on
my own Mac OS X system. I think it has to do with the "git blame"
vs. "git annotate" war which never really happened.
I think we had hoped that one of the two tools would prove to be
_the_ annotation/blame tool and would get used but thus far that
hasn't happened. Since they are two different implementations
they also differ slightly over how they attribute a change across
a merge, and in this case annotate is producing a different result
from blame - but that different result isn't considered to be wrong
so it hasn't been changed in annotate. Meanwhile the test has stayed
broken as a reminder that these two generate different results.
--
Shawn.
next prev parent reply other threads:[~2006-05-26 1:12 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-05-25 23:53 t8001-annotate.sh fails on Mac OS X Stefan Pfetzing
2006-05-26 1:11 ` Shawn Pearce [this message]
2006-05-26 3:02 ` Junio C Hamano
2006-05-26 3:12 ` Martin Langhoff
2006-05-27 1:40 ` Ryan Anderson
2006-05-26 4:32 ` Fredrik Kuivinen
2006-05-26 13:36 ` Johannes Schindelin
2006-05-26 13:51 ` Stefan Pfetzing
2006-05-27 18:13 ` Nicolas Vilz 'niv'
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=20060526011153.GA27720@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=stefan.pfetzing@gmail.com \
/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).