{"thread":{"id":"4295","subject":"t8001-annotate.sh fails on Mac OS X","startedAt":"2006-05-25T23:53:58Z","lastAt":"2006-05-27T18:13:47Z","messageCount":9,"participants":["Stefan Pfetzing","Shawn Pearce","Junio C Hamano","Martin Langhoff","Fredrik Kuivinen","Johannes Schindelin","Ryan Anderson","Nicolas Vilz 'niv'"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"20716","messageId":"f3d7535d0605251653m15db34f3j46403f4ed0c4c69f@mail.gmail.com","threadId":"4295","inReplyTo":null,"subject":"t8001-annotate.sh fails on Mac OS X","fromName":"Stefan Pfetzing","fromEmail":"stefan.pfetzing@gmail.com","sentAt":"2006-05-25T23:53:58Z","receivedAt":"2006-05-25T23:53:58Z","isPatch":false,"sender":{"key":"stefan.pfetzing@gmail.com","avatar":null},"body":"Hi,\n\nfor some reason I could not yet figure out, t8001-annotate.sh fails at test 18.\n\n--- snip ---\n* ok 17: some edit\n* expecting success: check_count A 1 B 1 B1 1 B2 1 \"A U Thor\" 1 C 1 D 1\nAuthor A (expected 1, attributed 1) good\nAuthor B1 (expected 1, attributed 1) good\nAuthor D (expected 1, attributed 2) bad\nAuthor A U Thor (expected 1, attributed 1) good\nAuthor B2 (expected 1, attributed 1) good\nAuthor B (expected 1, attributed 1) good\n* FAIL 18: some edit\n check_count A 1 B 1 B1 1 B2 1 \"A U Thor\" 1 C 1 D 1\n* failed 1 among 18 test(s)\n--- snap ---\n\nAnd git-annotate in the trash dir produces the following:\n\n--- snip ---\n5c085656 ( A 2006-05-25 23:13:26 +0000 1)lazy dog\n3f3e26a3 ( B2 2006-05-25 23:13:29 +0000 2)4A\nquick brown lazy dog fox jumps over the\n3b509ebb ( B 2006-05-25 23:13:27 +0000 3)lazy dog\n669d4e82 ( D 2006-05-25 23:13:35 +0000 4)99\nslow green fox jumps into the\nf96b8861 ( B1 2006-05-25 23:13:28 +0000 5)well.\na7bad43f ( A U Thor 2006-05-25 23:13:31 +0000 6)evil merge.\n669d4e82 ( D 2006-05-25 23:13:35 +0000 7)incomplete\n--- snap ---\n\nThe strange point is, git log is completely ok:\n\n--- snip ---\ncommit 90ef4f653d6dc33d90ce826303563e5506d5ad31\nAuthor: C \nDate: Thu May 25 23:13:34 2006 +0000\n\n Incomplete\n\n--- snap ---\n\nbye\n\nStefan\n\n-- \n http://www.dreamind.de/\nOroborus and Debian GNU/Linux Developer.\n"},{"id":"20718","messageId":"20060526011153.GA27720@spearce.org","threadId":"4295","inReplyTo":"f3d7535d0605251653m15db34f3j46403f4ed0c4c69f@mail.gmail.com","subject":"Re: t8001-annotate.sh fails on Mac OS X","fromName":"Shawn Pearce","fromEmail":"spearce@spearce.org","sentAt":"2006-05-26T01:11:53Z","receivedAt":"2006-05-26T01:11:53Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Stefan Pfetzing wrote:\n> Hi,\n> \n> for some reason I could not yet figure out, t8001-annotate.sh fails at test \n> 18.\n> \n> --- snip ---\n> * ok 17: some edit\n> * expecting success: check_count A 1 B 1 B1 1 B2 1 \"A U Thor\" 1 C 1 D 1\n> Author A (expected 1, attributed 1) good\n> Author B1 (expected 1, attributed 1) good\n> Author D (expected 1, attributed 2) bad\n> Author A U Thor (expected 1, attributed 1) good\n> Author B2 (expected 1, attributed 1) good\n> Author B (expected 1, attributed 1) good\n> * FAIL 18: some edit\n> check_count A 1 B 1 B1 1 B2 1 \"A U Thor\" 1 C 1 D 1\n> * failed 1 among 18 test(s)\n\nI've been seeing the same failed test case for a long time now on\nmy own Mac OS X system. I think it has to do with the \"git blame\"\nvs. \"git annotate\" war which never really happened.\n\nI think we had hoped that one of the two tools would prove to be\n_the_ annotation/blame tool and would get used but thus far that\nhasn't happened. Since they are two different implementations\nthey also differ slightly over how they attribute a change across\na merge, and in this case annotate is producing a different result\nfrom blame - but that different result isn't considered to be wrong\nso it hasn't been changed in annotate. Meanwhile the test has stayed\nbroken as a reminder that these two generate different results.\n\n-- \nShawn.\n"},{"id":"20725","messageId":"7vpsi1qyi2.fsf@assigned-by-dhcp.cox.net","threadId":"4295","inReplyTo":"20060526011153.GA27720@spearce.org","subject":"Re: t8001-annotate.sh fails on Mac OS X","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-05-26T03:02:45Z","receivedAt":"2006-05-26T03:02:45Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Shawn Pearce writes:\n\n> I think we had hoped that one of the two tools would prove to be\n> _the_ annotation/blame tool and would get used but thus far that\n> hasn't happened.\n\nI've been taking this as an indication that annotate/blame does\nnot actually matter in the real world.\n\nOr git is not yet used in the real world. Or perhaps a bit of\nboth.\n"},{"id":"20727","messageId":"46a038f90605252012u6aa97092w548d2b70b955f3dd@mail.gmail.com","threadId":"4295","inReplyTo":"7vpsi1qyi2.fsf@assigned-by-dhcp.cox.net","subject":"Re: t8001-annotate.sh fails on Mac OS X","fromName":"Martin Langhoff","fromEmail":"martin.langhoff@gmail.com","sentAt":"2006-05-26T03:12:09Z","receivedAt":"2006-05-26T03:12:09Z","isPatch":false,"sender":{"key":"martin.langhoff@gmail.com","avatar":"https://gravatar.com/avatar/1e3f311b6c4c15836501901ca58f8c0b0667246488084ba524d8bc9867e22fd9?d=mp&s=160"},"body":"On 5/26/06, Junio C Hamano wrote:\n> Or git is not yet used in the real world.\n\nBah. Real world? Been there, not worth it...\n\n\n\nm\n"},{"id":"20735","messageId":"20060526043258.GA4508@c165.ib.student.liu.se","threadId":"4295","inReplyTo":"20060526011153.GA27720@spearce.org","subject":"Re: t8001-annotate.sh fails on Mac OS X","fromName":"Fredrik Kuivinen","fromEmail":"freku045@student.liu.se","sentAt":"2006-05-26T04:32:59Z","receivedAt":"2006-05-26T04:32:59Z","isPatch":false,"sender":{"key":"frekui@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13770967?v=4"},"body":"On Thu, May 25, 2006 at 09:11:53PM -0400, Shawn Pearce wrote:\n> Stefan Pfetzing wrote:\n> > Hi,\n> > \n> > for some reason I could not yet figure out, t8001-annotate.sh fails at test \n> > 18.\n> > \n> > --- snip ---\n> > * ok 17: some edit\n> > * expecting success: check_count A 1 B 1 B1 1 B2 1 \"A U Thor\" 1 C 1 D 1\n> > Author A (expected 1, attributed 1) good\n> > Author B1 (expected 1, attributed 1) good\n> > Author D (expected 1, attributed 2) bad\n> > Author A U Thor (expected 1, attributed 1) good\n> > Author B2 (expected 1, attributed 1) good\n> > Author B (expected 1, attributed 1) good\n> > * FAIL 18: some edit\n> > check_count A 1 B 1 B1 1 B2 1 \"A U Thor\" 1 C 1 D 1\n> > * failed 1 among 18 test(s)\n> \n> I've been seeing the same failed test case for a long time now on\n> my own Mac OS X system. I think it has to do with the \"git blame\"\n> vs. \"git annotate\" war which never really happened.\n> \n> I think we had hoped that one of the two tools would prove to be\n> _the_ annotation/blame tool and would get used but thus far that\n> hasn't happened. Since they are two different implementations\n> they also differ slightly over how they attribute a change across\n> a merge, and in this case annotate is producing a different result\n> from blame - but that different result isn't considered to be wrong\n> so it hasn't been changed in annotate. Meanwhile the test has stayed\n> broken as a reminder that these two generate different results.\n>\n\nI have planned to come up with a nice test suite for blame/annotate,\nbut I haven't got around to it yet.\n\nI don't see this test failure on my Debian system. But it is true that\nfor some cases different blame/annotate outputs are equally correct,\nhowever not in this case. Note that the incomplete line is attributed\nto the commit with author D, but this commit did clearly not introduce\nthat line. The only correct answer, for that particular line, is the\ncommit with author C.\n\n- Fredrik\n"},{"id":"20754","messageId":"Pine.LNX.4.63.0605261534270.27610@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"4295","inReplyTo":"20060526011153.GA27720@spearce.org","subject":"Re: t8001-annotate.sh fails on Mac OS X","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-05-26T13:36:14Z","receivedAt":"2006-05-26T13:36:14Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Thu, 25 May 2006, Shawn Pearce wrote:\n\n> Stefan Pfetzing wrote:\n> > \n> > for some reason I could not yet figure out, t8001-annotate.sh fails at test \n> > 18.\n> \n> I've been seeing the same failed test case for a long time now on\n> my own Mac OS X system.\n\n... which is sort of funny, because I don't see it on my system. Running \nan iBook G3 with Mac OS X 10.2.8. \"make test\" runs through, and no, AFAICT \nI do not have any local modifications which could be responsible for that.\n\nCiao,\nDscho\n"},{"id":"20755","messageId":"f3d7535d0605260651o2adc239cg4536c554200fcb87@mail.gmail.com","threadId":"4295","inReplyTo":"Pine.LNX.4.63.0605261534270.27610@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: t8001-annotate.sh fails on Mac OS X","fromName":"Stefan Pfetzing","fromEmail":"stefan.pfetzing@gmail.com","sentAt":"2006-05-26T13:51:59Z","receivedAt":"2006-05-26T13:51:59Z","isPatch":false,"sender":{"key":"stefan.pfetzing@gmail.com","avatar":null},"body":"Hi Johannes,\n\n2006/5/26, Johannes Schindelin :\n\n> > I've been seeing the same failed test case for a long time now on\n> > my own Mac OS X system.\n>\n> ... which is sort of funny, because I don't see it on my system. Running\n> an iBook G3 with Mac OS X 10.2.8. \"make test\" runs through, and no, AFAICT\n> I do not have any local modifications which could be responsible for that.\n\nHm, well thats strange, although I guess Shawn runs Tiger - as I do.\n(10.4.6 currently).\n\nI tried already with DarwinPorts perl and OSX sytem perl. Both did not\nwork as expected.\n\nbye\n\nStefan\n-- \n http://www.dreamind.de/\nOroborus and Debian GNU/Linux Developer.\n"},{"id":"20769","messageId":"20060527014037.GA11935@h4x0r5.com","threadId":"4295","inReplyTo":"7vpsi1qyi2.fsf@assigned-by-dhcp.cox.net","subject":"Re: t8001-annotate.sh fails on Mac OS X","fromName":"Ryan Anderson","fromEmail":"ryan@michonline.com","sentAt":"2006-05-27T01:40:38Z","receivedAt":"2006-05-27T01:40:38Z","isPatch":false,"sender":{"key":"ryan@michonline.com","avatar":null},"body":"On Thu, May 25, 2006 at 08:02:45PM -0700, Junio C Hamano wrote:\n> Shawn Pearce writes:\n> \n> > I think we had hoped that one of the two tools would prove to be\n> > _the_ annotation/blame tool and would get used but thus far that\n> > hasn't happened.\n> \n> I've been taking this as an indication that annotate/blame does\n> not actually matter in the real world.\n\nIt probably doesn't matter in the real world.\n\nAt the moment, I'd blame annotate for being wrong, I know it does the\nwrong thing on some merges, and I had a plan to try to fix it, but I got\ndistracted by finding a new job and moving across the country, so I\nhaven't really had a chance to fix it, something to look at shortly, I\nhope. (I'm having problems getting one of my machines back up, so\nthat's going to slow me down slightly)\n\n> Or git is not yet used in the real world. Or perhaps a bit of\n> both.\n\nIt's just that \"annotate\" isn't a common operation in the communities\nthat Git has made it into.\n"},{"id":"20807","messageId":"447896DB.4040001@iaglans.de","threadId":"4295","inReplyTo":"Pine.LNX.4.63.0605261534270.27610@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: t8001-annotate.sh fails on Mac OS X","fromName":"Nicolas Vilz 'niv'","fromEmail":"niv@iaglans.de","sentAt":"2006-05-27T18:13:47Z","receivedAt":"2006-05-27T18:13:47Z","isPatch":false,"sender":{"key":"niv@iaglans.de","avatar":"https://gravatar.com/avatar/e4d43a32d721241212d4edb1d2210327e28423c913071b4bfeeaa0ce15296110?d=mp&s=160"},"body":"Johannes Schindelin schrieb:\n> Hi,\n> \n> On Thu, 25 May 2006, Shawn Pearce wrote:\n> \n>> Stefan Pfetzing wrote:\n>>> for some reason I could not yet figure out, t8001-annotate.sh fails at test \n>>> 18.\n>> I've been seeing the same failed test case for a long time now on\n>> my own Mac OS X system.\n> \n> ... which is sort of funny, because I don't see it on my system. Running \n> an iBook G3 with Mac OS X 10.2.8. \"make test\" runs through, and no, AFAICT \n> I do not have any local modifications which could be responsible for that.\n\nI just tried it on my Powerbook G4 running MacOSX 10.4.6 and failed on \ntest 18, too.\n\nI am just doing a complete test with make test...\n\nsame situation:\n\n* FAIL 18: some edit\n check_count A 1 B 1 B1 1 B2 1 \"A U Thor\" 1 C 1 D 1\n* failed 1 among 18 test(s)\nmake[1]: *** [t8001-annotate.sh] Error 1\nmake: *** [test] Error 2\n\n\nI am using the master tree for this test.\n\nAny suggestions?\n"}]}