{"thread":{"id":"43123","subject":"Re: [PATCH] git-cvsserver: fix breakage when calling git merge-file","startedAt":"2006-12-19T22:58:20Z","lastAt":"2006-12-20T00:38:57Z","messageCount":3,"participants":["Junio C Hamano","Johannes Schindelin","Eric Wong"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"296280","messageId":"20061219225820.GA6418@soma","threadId":"43123","inReplyTo":null,"subject":"[PATCH] git-cvsserver: fix breakage when calling git merge-file","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2006-12-19T22:58:20Z","receivedAt":"2006-12-19T22:58:20Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"In the same vein as 8336afa563fbeff35e531396273065161181f04c,\nthis fixes the the RCS merge to git-merge-file conversion in\ncommit e2b70087.\n\nSigned-off-by: Eric Wong <normalperson@yhbt.net>\n---\n git-cvsserver.perl |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-cvsserver.perl b/git-cvsserver.perl\nindex 2a8447e..df39512 100755\n--- a/git-cvsserver.perl\n+++ b/git-cvsserver.perl\n@@ -946,7 +946,7 @@ sub req_update\n \n             $log->debug(\"Temporary directory for merge is $dir\");\n \n-            my $return = system(\"git merge-file\", $file_local, $file_old, $file_new);\n+            my $return = system(\"git\", \"merge-file\", $file_local, $file_old, $file_new);\n             $return >>= 8;\n \n             if ( $return == 0 )\n-- \n1.4.4.2.ga184\n"},{"id":"295845","messageId":"Pine.LNX.4.63.0612200058280.19693@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"43123","inReplyTo":"20061219225820.GA6418@soma","subject":"Re: [PATCH] git-cvsserver: fix breakage when calling git merge-file","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-12-19T23:59:53Z","receivedAt":"2006-12-19T23:59:53Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Tue, 19 Dec 2006, Eric Wong wrote:\n\n> In the same vein as 8336afa563fbeff35e531396273065161181f04c, this fixes \n> the the RCS merge to git-merge-file conversion in commit e2b70087.\n\nOoops. I should have checked after reading 8336afa if there are more \noffenders. Alas, I checked now, and there seem none to be left. But \neverybody can see now why I try to get an all-C Git: I suck at perl.\n\nCiao,\nDscho\n"},{"id":"293880","messageId":"7vodpzo0ym.fsf@assigned-by-dhcp.cox.net","threadId":"43123","inReplyTo":"Pine.LNX.4.63.0612200058280.19693@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: [PATCH] git-cvsserver: fix breakage when calling git merge-file","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-12-20T00:38:57Z","receivedAt":"2006-12-20T00:38:57Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n\n> On Tue, 19 Dec 2006, Eric Wong wrote:\n>\n>> In the same vein as 8336afa563fbeff35e531396273065161181f04c, this fixes \n>> the the RCS merge to git-merge-file conversion in commit e2b70087.\n>\n> Ooops. I should have checked after reading 8336afa if there are more \n> offenders. Alas, I checked now, and there seem none to be left. But \n> everybody can see now why I try to get an all-C Git: I suck at perl.\n\nWell, I should have been more careful to begin with.  My\napologies.\n\nAnd thanks both.\n"}]}