{"thread":{"id":"2568","subject":"\"make test\" fails with current HEAD","startedAt":"2005-11-17T15:31:56Z","lastAt":"2005-11-18T23:44:46Z","messageCount":20,"participants":["Matthias Urlichs","Johannes Schindelin","A Large Angry SCM","Junio C Hamano","Linus Torvalds","John Benes"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"12112","messageId":"pan.2005.11.17.15.31.56.755022@smurf.noris.de","threadId":"2568","inReplyTo":null,"subject":"\"make test\" fails with current HEAD","fromName":"Matthias Urlichs","fromEmail":"smurf@smurf.noris.de","sentAt":"2005-11-17T15:31:56Z","receivedAt":"2005-11-17T15:31:56Z","isPatch":false,"sender":{"key":"matthias@urlichs.de","avatar":"https://gravatar.com/avatar/2708905af227313eba6f2b2ae0f7d0259b5ac5d71baef58fe5a13c699ce0bbf0?d=mp&s=160"},"body":"t4103.sh:\n\nfatal: patch with only garbage at line 30\n* FAIL 7: check binary diff with replacement.\n git-checkout master\n git-apply --check --allow-binary-replacement BF.diff\n\nMay I suggest to please run \"make test\" before pushing? Thanks! ;-)\n\n-- \nMatthias Urlichs | {M:U} IT Design @ m-u-it.de | smurf@smurf.noris.de\nDisclaimer: The quote was selected randomly. Really. | http://smurf.noris.de\n - -\nShe balanced dignity on the tip of her nose.\n"},{"id":"12113","messageId":"Pine.LNX.4.63.0511171652020.17402@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"2568","inReplyTo":"pan.2005.11.17.15.31.56.755022@smurf.noris.de","subject":"Re: \"make test\" fails with current HEAD","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2005-11-17T15:52:28Z","receivedAt":"2005-11-17T15:52:28Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Thu, 17 Nov 2005, Matthias Urlichs wrote:\n\n> t4103.sh:\n> \n> fatal: patch with only garbage at line 30\n> * FAIL 7: check binary diff with replacement.\n> git-checkout master\n> git-apply --check --allow-binary-replacement BF.diff\n\nDoes not fail here.\n\nDid you set your GIT_EXEC_PATH?\n\nHth,\nDscho\n"},{"id":"12115","messageId":"20051117160318.GE31613@kiste.smurf.noris.de","threadId":"2568","inReplyTo":"Pine.LNX.4.63.0511171652020.17402@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: \"make test\" fails with current HEAD","fromName":"Matthias Urlichs","fromEmail":"smurf@smurf.noris.de","sentAt":"2005-11-17T16:03:18Z","receivedAt":"2005-11-17T16:03:18Z","isPatch":false,"sender":{"key":"matthias@urlichs.de","avatar":"https://gravatar.com/avatar/2708905af227313eba6f2b2ae0f7d0259b5ac5d71baef58fe5a13c699ce0bbf0?d=mp&s=160"},"body":"Hi,\n\nJohannes Schindelin:\n> Does not fail here.\n> \nDoes fail here...\n\n> Did you set your GIT_EXEC_PATH?\n> \nYes. :-/\n\nI'll dig.\n-- \nMatthias Urlichs | {M:U} IT Design @ m-u-it.de | smurf@smurf.noris.de\nDisclaimer: The quote was selected randomly. Really. | http://smurf.noris.de\n - -\n\"Today, the theory of evolution is an accepted fact for everyone but\n a fundamentalist minority, whose objections are based not on reasoning\n but on doctrinaire adherence to religious principles.\"\n [Dr. James D. Watson, winner of the Nobel prize\n for his co-discovery of the structure of DNA]\n"},{"id":"12177","messageId":"437D4924.50307@gmail.com","threadId":"2568","inReplyTo":"Pine.LNX.4.63.0511171652020.17402@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: \"make test\" fails with current HEAD","fromName":"A Large Angry SCM","fromEmail":"gitzilla@gmail.com","sentAt":"2005-11-18T03:23:16Z","receivedAt":"2005-11-18T03:23:16Z","isPatch":false,"sender":{"key":"gitzilla@gmail.com","avatar":"https://gravatar.com/avatar/354625c442439908ff3dd99757dee330e29e9df7847472384faf7a00add247fb?d=mp&s=160"},"body":"Fails at home (Suse 9.3) but passes a work (Ubuntu Hoary).\n\n*** t4103-apply-binary.sh ***\n* ok 1: stat binary diff -- should not fail.\n* ok 2: stat binary diff (copy) -- should not fail.\n* ok 3: check binary diff -- should fail.\n* ok 4: check binary diff (copy) -- should fail.\n* ok 5: check incomplete binary diff with replacement -- should fail.\n* ok 6: check incomplete binary diff with replacement (copy) -- should \nfail.\n* FAIL 7: check binary diff with replacement.\n git-checkout master\n git-apply --check --allow-binary-replacement BF.diff\n* FAIL 8: check binary diff with replacement (copy).\n git-checkout master\n git-apply --check --allow-binary-replacement CF.diff\n* ok 9: apply binary diff -- should fail.\n* ok 10: apply binary diff -- should fail.\n* ok 11: apply binary diff (copy) -- should fail.\n* ok 12: apply binary diff (copy) -- should fail.\n* ok 13: apply binary diff without replacement -- should fail.\n* ok 14: apply binary diff without replacement (copy) -- should fail.\n* FAIL 15: apply binary diff.\n do_reset\n git-apply --allow-binary-replacement --index BF.diff &&\n test -z \"$(git-diff --name-status binary)\"\n* FAIL 16: apply binary diff (copy).\n do_reset\n git-apply --allow-binary-replacement --index CF.diff &&\n test -z \"$(git-diff --name-status binary)\"\n* failed 4 among 16 test(s)\nmake[1]: *** [t4103-apply-binary.sh] Error 1\n\n\nJohannes Schindelin wrote:\n> Hi,\n> \n> On Thu, 17 Nov 2005, Matthias Urlichs wrote:\n> \n>>t4103.sh:\n>>\n>>fatal: patch with only garbage at line 30\n>>* FAIL 7: check binary diff with replacement.\n>> git-checkout master\n>> git-apply --check --allow-binary-replacement BF.diff\n> \n> Does not fail here.\n> \n> Did you set your GIT_EXEC_PATH?\n> \n> Hth,\n> Dscho\n> -\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at http://vger.kernel.org/majordomo-info.html\n> \n"},{"id":"12178","messageId":"Pine.LNX.4.63.0511180425200.6820@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"2568","inReplyTo":"437D4924.50307@gmail.com","subject":"Re: \"make test\" fails with current HEAD","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2005-11-18T03:27:17Z","receivedAt":"2005-11-18T03:27:17Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Thu, 17 Nov 2005, A Large Angry SCM wrote:\n\n> Fails at home (Suse 9.3) but passes a work (Ubuntu Hoary).\n> \n> *** t4103-apply-binary.sh ***\n> * ok 1: stat binary diff -- should not fail.\n> * ok 2: stat binary diff (copy) -- should not fail.\n> * ok 3: check binary diff -- should fail.\n> * ok 4: check binary diff (copy) -- should fail.\n> * ok 5: check incomplete binary diff with replacement -- should fail.\n> * ok 6: check incomplete binary diff with replacement (copy) -- should fail.\n> * FAIL 7: check binary diff with replacement.\n> git-checkout master\n> git-apply --check --allow-binary-replacement BF.diff\n\nAny chance you investigate this in detail? Like inserting \"test_done; \nexit\" right before that test, only running t4103-*, and then executing\nthe command yourself?\n\nHth,\nDscho\n"},{"id":"12195","messageId":"20051118072115.GJ31613@kiste.smurf.noris.de","threadId":"2568","inReplyTo":"Pine.LNX.4.63.0511180425200.6820@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: \"make test\" fails with current HEAD","fromName":"Matthias Urlichs","fromEmail":"smurf@smurf.noris.de","sentAt":"2005-11-18T07:21:16Z","receivedAt":"2005-11-18T07:21:16Z","isPatch":false,"sender":{"key":"matthias@urlichs.de","avatar":"https://gravatar.com/avatar/2708905af227313eba6f2b2ae0f7d0259b5ac5d71baef58fe5a13c699ce0bbf0?d=mp&s=160"},"body":"Hi,\n\nJohannes Schindelin:\n> Any chance you investigate this in detail? Like inserting \"test_done; \n> exit\" right before that test, only running t4103-*, and then executing\n> the command yourself?\n> \nThank you, I know how to debug ;-)\n\nAlready in progress.\n\n-- \nMatthias Urlichs | {M:U} IT Design @ m-u-it.de | smurf@smurf.noris.de\nDisclaimer: The quote was selected randomly. Really. | http://smurf.noris.de\n - -\nA life spent in search of the perfect hash brownie is a life well spent.\n"},{"id":"12199","messageId":"7v7jb6o1kl.fsf@assigned-by-dhcp.cox.net","threadId":"2568","inReplyTo":"pan.2005.11.17.15.31.56.755022@smurf.noris.de","subject":"Re: \"make test\" fails with current HEAD","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-11-18T07:30:18Z","receivedAt":"2005-11-18T07:30:18Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matthias Urlichs writes:\n\n> t4103.sh:\n>\n> fatal: patch with only garbage at line 30\n> * FAIL 7: check binary diff with replacement.\n> git-checkout master\n> git-apply --check --allow-binary-replacement BF.diff\n>\n> May I suggest to please run \"make test\" before pushing? Thanks! ;-)\n\nWell, I do, but the thing is, I do not have an access to your\nparticular machine ;-).\n\nI *think* this is the same problem as I fixed tonight with help\nfrom LASCM and John Benes, and I'm hoping to push the fix out\nbefore going to bed tonight. If you are impatient the patch has\nalready been sent out.\n"},{"id":"12200","messageId":"20051118075117.GK31613@kiste.smurf.noris.de","threadId":"2568","inReplyTo":"7v7jb6o1kl.fsf@assigned-by-dhcp.cox.net","subject":"Re: \"make test\" fails with current HEAD","fromName":"Matthias Urlichs","fromEmail":"smurf@smurf.noris.de","sentAt":"2005-11-18T07:51:17Z","receivedAt":"2005-11-18T07:51:17Z","isPatch":false,"sender":{"key":"matthias@urlichs.de","avatar":"https://gravatar.com/avatar/2708905af227313eba6f2b2ae0f7d0259b5ac5d71baef58fe5a13c699ce0bbf0?d=mp&s=160"},"body":"Hi,\n\nJunio C Hamano:\n> > May I suggest to please run \"make test\" before pushing? Thanks! ;-)\n> \n> Well, I do, but the thing is, I do not have an access to your\n> particular machine ;-).\n> \n*Sigh*.\n\nSorry about that. It's not you, it's diff 2.8.7 -- which conveniently\nomits the word \"Binary\".\n\n>> Files /dev/null and b/file3 differ\n\nOf course, with LANG=de_DE.UTF-8 the situation is worse ...\n\n>> Dateien /dev/null und b/file3 sind verschieden.\n\n... so git-diff-* might want to set LANG=C.\n\n-- \nMatthias Urlichs | {M:U} IT Design @ m-u-it.de | smurf@smurf.noris.de\nDisclaimer: The quote was selected randomly. Really. | http://smurf.noris.de\n - -\nThey're only trying to make me LOOK paranoid!\n"},{"id":"12203","messageId":"7vbr0imlha.fsf@assigned-by-dhcp.cox.net","threadId":"2568","inReplyTo":"20051118075117.GK31613@kiste.smurf.noris.de","subject":"Re: \"make test\" fails with current HEAD","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-11-18T08:03:13Z","receivedAt":"2005-11-18T08:03:13Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matthias Urlichs writes:\n\n>>> Files /dev/null and b/file3 differ\n>\n> Of course, with LANG=de_DE.UTF-8 the situation is worse ...\n\nAnd at this point it becomes more and more tempting to have our\nown internal diff generator, without relying on external diff.\n\nA midway compromise solution would be to detect if either file\nis binary ourselves and not to call diff but always say \"Binary\nfiles difer\".\n"},{"id":"12202","messageId":"7v8xvmmlgt.fsf@assigned-by-dhcp.cox.net","threadId":"2568","inReplyTo":"20051118075117.GK31613@kiste.smurf.noris.de","subject":"Re: \"make test\" fails with current HEAD","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-11-18T08:03:30Z","receivedAt":"2005-11-18T08:03:30Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matthias Urlichs writes:\n\n>>> Files /dev/null and b/file3 differ\n>\n> Of course, with LANG=de_DE.UTF-8 the situation is worse ...\n\nAnd at this point it becomes more and more tempting to have our\nown internal diff generator, without relying on external diff.\n\nA midway compromise solution would be to detect if either file\nis binary ourselves and not to call diff but always say \"Binary\nfiles differ\".\n"},{"id":"12207","messageId":"pan.2005.11.18.08.56.22.908009@smurf.noris.de","threadId":"2568","inReplyTo":"7vbr0imlha.fsf@assigned-by-dhcp.cox.net","subject":"Re: \"make test\" fails with current HEAD","fromName":"Matthias Urlichs","fromEmail":"smurf@smurf.noris.de","sentAt":"2005-11-18T08:56:25Z","receivedAt":"2005-11-18T08:56:25Z","isPatch":false,"sender":{"key":"matthias@urlichs.de","avatar":"https://gravatar.com/avatar/2708905af227313eba6f2b2ae0f7d0259b5ac5d71baef58fe5a13c699ce0bbf0?d=mp&s=160"},"body":"Hi, Junio C Hamano wrote:\n\n> Matthias Urlichs writes:\n> \n>>>> Files /dev/null and b/file3 differ\n>>\n>> Of course, with LANG=de_DE.UTF-8 the situation is worse ...\n> \n> A midway compromise solution would be to detect if either file\n> is binary ourselves and not to call diff but always say \"Binary\n> files difer\".\n\nActually, there's a better way:\n\n$ diff -u /dev/null /tmp/ra\nBinary files /dev/null and /tmp/ra differ\n$ echo $?\n2\n\nSo the trivial fix is to emit our own \"Binary files FOO and BAR differ\"\nline if the exit status is 2.\n\n-- \nMatthias Urlichs | {M:U} IT Design @ m-u-it.de | smurf@smurf.noris.de\nDisclaimer: The quote was selected randomly. Really. | http://smurf.noris.de\n - -\nIf a man will go as far as he can see, he will be able to see farther when\nhe gets there.\n"},{"id":"12211","messageId":"Pine.LNX.4.63.0511181134080.8037@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"2568","inReplyTo":"pan.2005.11.18.08.56.22.908009@smurf.noris.de","subject":"Re: \"make test\" fails with current HEAD","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2005-11-18T10:35:26Z","receivedAt":"2005-11-18T10:35:26Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 18 Nov 2005, Matthias Urlichs wrote:\n\n> So the trivial fix is to emit our own \"Binary files FOO and BAR differ\"\n> line if the exit status is 2.\n\n>From my diff man page:\n\n-- snip --\nDIAGNOSTICS\n An exit status of 0 means no differences were found, 1 means some \n differences were found, and 2 means trouble.\n-- snap --\n\nThe exit value 2 is ambiguous for at least one version of GNU diff.\n\nHth,\nDscho\n"},{"id":"12213","messageId":"20051118105415.GN31613@kiste.smurf.noris.de","threadId":"2568","inReplyTo":"Pine.LNX.4.63.0511181134080.8037@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: \"make test\" fails with current HEAD","fromName":"Matthias Urlichs","fromEmail":"smurf@smurf.noris.de","sentAt":"2005-11-18T10:54:15Z","receivedAt":"2005-11-18T10:54:15Z","isPatch":false,"sender":{"key":"matthias@urlichs.de","avatar":"https://gravatar.com/avatar/2708905af227313eba6f2b2ae0f7d0259b5ac5d71baef58fe5a13c699ce0bbf0?d=mp&s=160"},"body":"Hi,\n\nJohannes Schindelin:\n> From my diff man page:\n> \n> -- snip --\n> DIAGNOSTICS\n> An exit status of 0 means no differences were found, 1 means some \n> differences were found, and 2 means trouble.\n> -- snap --\n> \n> The exit value 2 is ambiguous for at least one version of GNU diff.\n> \nAFAIK, We have\n0 - no difference\n1 - produced a reasonable diff\n1 - produced a bad diff because binary stuff starts\n after 4096-or-whatever bytes and diff didn't notice\n2 - didn't produce a diff -- binary files differ\n2 - something else broke\n\nRight now we simply don't consider the second -2- case, because we just\nsuccessfully wrote the two files in question; there's not *that* much\nthat can fail after that. The second -1- case is sufficiently rare too.\n\nSo I still think a \"Just write a 'Binary files FOO and BAR differ' line\nif the exit status is 2\" rule would at least fix the current bug with\ndiff 2.8.7.\n\n-- \nMatthias Urlichs | {M:U} IT Design @ m-u-it.de | smurf@smurf.noris.de\nDisclaimer: The quote was selected randomly. Really. | http://smurf.noris.de\n - -\n xtifr - beware of james when he's off his medication =3D>\n"},{"id":"12215","messageId":"Pine.LNX.4.63.0511181203510.16457@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"2568","inReplyTo":"20051118105415.GN31613@kiste.smurf.noris.de","subject":"Re: \"make test\" fails with current HEAD","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2005-11-18T11:04:40Z","receivedAt":"2005-11-18T11:04:40Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 18 Nov 2005, Matthias Urlichs wrote:\n\n> Johannes Schindelin:\n> > From my diff man page:\n> > \n> > -- snip --\n> > DIAGNOSTICS\n> > An exit status of 0 means no differences were found, 1 means some \n> > differences were found, and 2 means trouble.\n> > -- snap --\n> > \n> > The exit value 2 is ambiguous for at least one version of GNU diff.\n> > \n> AFAIK, We have\n> 0 - no difference\n> 1 - produced a reasonable diff\n> 1 - produced a bad diff because binary stuff starts\n> after 4096-or-whatever bytes and diff didn't notice\n> 2 - didn't produce a diff -- binary files differ\n> 2 - something else broke\n> \n> Right now we simply don't consider the second -2- case, because we just\n> successfully wrote the two files in question; there's not *that* much\n> that can fail after that. The second -1- case is sufficiently rare too.\n> \n> So I still think a \"Just write a 'Binary files FOO and BAR differ' line\n> if the exit status is 2\" rule would at least fix the current bug with\n> diff 2.8.7.\n\nDunno. Am I the only one with an odd feeling about that?\n\nCiao,\nDscho\n"},{"id":"12216","messageId":"20051118111204.GO31613@kiste.smurf.noris.de","threadId":"2568","inReplyTo":"Pine.LNX.4.63.0511181203510.16457@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: \"make test\" fails with current HEAD","fromName":"Matthias Urlichs","fromEmail":"smurf@smurf.noris.de","sentAt":"2005-11-18T11:12:04Z","receivedAt":"2005-11-18T11:12:04Z","isPatch":false,"sender":{"key":"matthias@urlichs.de","avatar":"https://gravatar.com/avatar/2708905af227313eba6f2b2ae0f7d0259b5ac5d71baef58fe5a13c699ce0bbf0?d=mp&s=160"},"body":"Hi,\n\nJohannes Schindelin:\n> > So I still think a \"Just write a 'Binary files FOO and BAR differ' line\n> > if the exit status is 2\" rule would at least fix the current bug with\n> > diff 2.8.7.\n> \n> Dunno. Am I the only one with an odd feeling about that?\n> \nI don't really like it either, but frankly I'm not going to write a new\n(or integrate an existing) diff implementation for 1.0 ... you want to\ndo it, feel free. ;-)\n\n-- \nMatthias Urlichs | {M:U} IT Design @ m-u-it.de | smurf@smurf.noris.de\nDisclaimer: The quote was selected randomly. Really. | http://smurf.noris.de\n - -\nBOFH excuse #217:\n\nThe MGs ran out of gas.\n"},{"id":"12227","messageId":"Pine.LNX.4.64.0511180812200.13959@g5.osdl.org","threadId":"2568","inReplyTo":"7vbr0imlha.fsf@assigned-by-dhcp.cox.net","subject":"Re: \"make test\" fails with current HEAD","fromName":"Linus Torvalds","fromEmail":"torvalds@osdl.org","sentAt":"2005-11-18T16:14:01Z","receivedAt":"2005-11-18T16:14:01Z","isPatch":false,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\n\nOn Fri, 18 Nov 2005, Junio C Hamano wrote:\n> \n> And at this point it becomes more and more tempting to have our\n> own internal diff generator, without relying on external diff.\n> \n> A midway compromise solution would be to detect if either file\n> is binary ourselves and not to call diff but always say \"Binary\n> files difer\".\n\nUmm.. Why not just say \"if the line after the 'diff' line doesn't start \nwith '@@ ', then it's a binary diff\"?\n\nAnd not care at _all_ about what it says.\n\nWe require unified diffs, and they _always_ start with '@@ ' after the \nheader. No need to check anything else.\n\n\t\tLinus\n"},{"id":"12233","messageId":"7vwtj5lvvc.fsf@assigned-by-dhcp.cox.net","threadId":"2568","inReplyTo":"Pine.LNX.4.64.0511180812200.13959@g5.osdl.org","subject":"Re: \"make test\" fails with current HEAD","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-11-18T17:16:23Z","receivedAt":"2005-11-18T17:16:23Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Linus Torvalds writes:\n\n> Umm.. Why not just say \"if the line after the 'diff' line doesn't start \n> with '@@ ', then it's a binary diff\"?\n\nThanks, that makes sense.\n"},{"id":"12238","messageId":"7vveypkbwa.fsf@assigned-by-dhcp.cox.net","threadId":"2568","inReplyTo":"7vwtj5lvvc.fsf@assigned-by-dhcp.cox.net","subject":"Re: \"make test\" fails with current HEAD","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-11-18T19:13:09Z","receivedAt":"2005-11-18T19:13:09Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> Linus Torvalds writes:\n>\n>> Umm.. Why not just say \"if the line after the 'diff' line doesn't start \n>> with '@@ ', then it's a binary diff\"?\n>\n> Thanks, that makes sense.\n\nMaybe not; parse_single_patch would have eaten '@@ -' lines so\nin practice that amounts to not checking anything at all.\n\nWhich is not a bad idea, though... That means we would treat\nall empty patches as binary diffs, which is certainly simple,\nbut is it safe enough?\n"},{"id":"12281","messageId":"437E5A79.9070402@gmail.com","threadId":"2568","inReplyTo":"7v7jb6o1kl.fsf@assigned-by-dhcp.cox.net","subject":"Re: \"make test\" fails with current HEAD","fromName":"John Benes","fromEmail":"smartcat99s@gmail.com","sentAt":"2005-11-18T22:49:29Z","receivedAt":"2005-11-18T22:49:29Z","isPatch":false,"sender":{"key":"smartcat99s@gmail.com","avatar":null},"body":"-----BEGIN PGP SIGNED MESSAGE-----\nHash: SHA1\n\nJunio C Hamano wrote:\n> I *think* this is the same problem as I fixed tonight with help\n> from LASCM and John Benes, and I'm hoping to push the fix out\n> before going to bed tonight. If you are impatient the patch has\n> already been sent out.\n\nI can verify that \"make test\" now passes on Cygwin without NO_MMAP\nuncommented.\nCommit: 2e67a5f449f4026097494569f871d79bf263ab28\nDesc: Cygwin *might* be helped with NO_MMAP\n\n- --\nJohn Benes\nGPG Fingerprint: D519 25DB BB5C 38FC 9D02 02E7 596D BC50 F880 27FA\n\"It is not only the living who are killed in war.\" - Isaac Asimov\n-----BEGIN PGP SIGNATURE-----\nVersion: GnuPG v1.4.1 (MingW32)\nComment: Using GnuPG with Mozilla - http://enigmail.mozdev.org\n\niQIVAwUBQ35aeWF0oWcU9kCNAQIpgg/9GFi++HvW5J2GYZbcHhAld2cqd6KtgbPN\noUsbPuvGKSM9uP/9pKhOxp+DKJMuFd9mK5FG63jS8i8bthbEzegErLWcfbfM1+Js\n0kYIfQEZpJu0+S1uMfsHX1CfS/OtjHebQCD7M9jgMFa1kgJXZl0Zu1rvG5hxTIZV\nOwssVwxz9Z2/gWzKFlAwyL4UgI4/mr2f7t43AVSKI0gR0Dry8Ou6B7vjBid9clMd\nJNoVHF437FVzAypoSUjmgHJJt+GHYn5noQTOMD0KnokznQckFVxNdALXaoAgkT1Q\nadgY+8TObmTbctJ9q2Qi1Z9Y0CAncC0TEGt8D8FBxiH+eJKqEKdmL7JT3ckaQO6S\nWZJf/u9SnkUJ089rYbYCvV10hqXz0y5XcGxo8kRKS6XGnY+Ff0hqtxVtHqbog8+y\nRtPyeST3vymkPuxx3g/gHrGtXJSZStE2/uNTKyA6IHA9dRUkLn70vHRKZsKKyj/f\nn5Ka1CJhIw+DzN4tANsQz9U/Q1olbQIr1khykds5DOhTvdSydSQtT3yOx9Wtt8QZ\nOH16pbWSGRNuL/vtwmonnVDsX/JJkUKSn3Z5gwmIvThvrD5TbJjyyYBaYZ9xvtkK\nXShm05Xf0yaryVlyUNCjlfNoLhi+gBoTVeaZmx/c1yrDZL6I53g3S79Bktdfd/rE\nr0eQqS7GEWc=\n=+a+2\n-----END PGP SIGNATURE-----\n"},{"id":"12280","messageId":"7vacg1frm9.fsf_-_@assigned-by-dhcp.cox.net","threadId":"2568","inReplyTo":"437E5A79.9070402@gmail.com","subject":"[PATCH] Do not show .exe in git command list.","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-11-18T23:44:46Z","receivedAt":"2005-11-18T23:44:46Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Truncate the result from readdir() in the exec-path if they end\nwith .exe, to make it a bit more readable on Cygwin.\n\nSigned-off-by: Junio C Hamano \n\n---\n\n Today I borrowed a Cygwin environment to build things without\n any customization (no config.mak nor make command line\n override), and I have to report that make test passed OK for\n me.\n\n git.c | 5 ++++-\n 1 files changed, 4 insertions(+), 1 deletions(-)\n\napplies-to: ff891e258456492507934e82d90fd8aacb124845\nf9039f30d56e3815eaab870d8b19c7b94aded8aa\ndiff --git a/git.c b/git.c\nindex b9b8c62..bdd3f8d 100644\n--- a/git.c\n+++ b/git.c\n@@ -59,7 +59,8 @@ static void add_cmdname(const char *name\n \tif (!ent)\n \t\toom();\n \tent->len = len;\n-\tmemcpy(ent->name, name, len+1);\n+\tmemcpy(ent->name, name, len);\n+\tent->name[len] = 0;\n \tcmdname[cmdname_cnt++] = ent;\n }\n \n@@ -132,6 +133,8 @@ static void list_commands(const char *ex\n \t\t\tcontinue;\n \n \t\tentlen = strlen(de->d_name);\n+\t\tif (4 < entlen && !strcmp(de->d_name + entlen - 4, \".exe\"))\n+\t\t\tentlen -= 4;\n \n \t\tif (longest < entlen)\n \t\t\tlongest = entlen;\n---\n0.99.9.GIT\n"}]}