t8001-annotate.sh fails on Mac OS X

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)
--- snap ---

And git-annotate in the trash dir produces the following:

--- snip --- 5c085656 ( A 2006-05-25 23:13:26 +0000 1)lazy dog 3f3e26a3 ( B2 2006-05-25 23:13:29 +0000 2)4A quick brown lazy dog fox jumps over the 3b509ebb ( B 2006-05-25 23:13:27 +0000 3)lazy dog 669d4e82 ( D 2006-05-25 23:13:35 +0000 4)99 slow green fox jumps into the f96b8861 ( B1 2006-05-25 23:13:28 +0000 5)well. a7bad43f ( A U Thor 2006-05-25 23:13:31 +0000 6)evil merge. 669d4e82 ( D 2006-05-25 23:13:35 +0000 7)incomplete --- snap ---

The strange point is, git log is completely ok:

--- snip ---
commit 90ef4f653d6dc33d90ce826303563e5506d5ad31
Author: C <author@example.com>
Date:   Thu May 25 23:13:34 2006 +0000

    Incomplete

--- snap ---

bye

Stefan

Stefan Pfetzing <stefan.pfetzing@gmail.com> wrote:

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 Pearce <spearce@spearce.org> writes:

I've been taking this as an indication that annotate/blame does not actually matter in the real world.

Or git is not yet used in the real world. Or perhaps a bit of both.

On 5/26/06, Junio C Hamano <junkio@cox.net> wrote:

Bah. Real world? Been there, not worth it...

m

On Thu, May 25, 2006 at 08:02:45PM -0700, Junio C Hamano wrote:

It probably doesn't matter in the real world.

At the moment, I'd blame annotate for being wrong, I know it does the wrong thing on some merges, and I had a plan to try to fix it, but I got distracted by finding a new job and moving across the country, so I haven't really had a chance to fix it, something to look at shortly, I hope. (I'm having problems getting one of my machines back up, so that's going to slow me down slightly)

It's just that "annotate" isn't a common operation in the communities that Git has made it into.

On Thu, May 25, 2006 at 09:11:53PM -0400, Shawn Pearce wrote:

I have planned to come up with a nice test suite for blame/annotate, but I haven't got around to it yet.

I don't see this test failure on my Debian system. But it is true that for some cases different blame/annotate outputs are equally correct, however not in this case. Note that the incomplete line is attributed to the commit with author D, but this commit did clearly not introduce that line. The only correct answer, for that particular line, is the commit with author C.

- Fredrik

Hi,

On Thu, 25 May 2006, Shawn Pearce wrote:

... which is sort of funny, because I don't see it on my system. Running an iBook G3 with Mac OS X 10.2.8. "make test" runs through, and no, AFAICT I do not have any local modifications which could be responsible for that.

Ciao, Dscho

Hi Johannes,

2006/5/26, Johannes Schindelin <Johannes.Schindelin@gmx.de>:

Hm, well thats strange, although I guess Shawn runs Tiger - as I do. (10.4.6 currently).

I tried already with DarwinPorts perl and OSX sytem perl. Both did not work as expected.

bye

Stefan

Johannes Schindelin schrieb:

I just tried it on my Powerbook G4 running MacOSX 10.4.6 and failed on test 18, too.

I am just doing a complete test with make test...

same situation:

* 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)
make[1]: *** [t8001-annotate.sh] Error 1
make: *** [test] Error 2

I am using the master tree for this test.

Any suggestions?