[PATCH] git-cvsserver: fix breakage when calling git merge-file

[PATCH] git-cvsserver: fix breakage when calling git merge-file

[Eric Wong]

In the same vein as 8336afa563fbeff35e531396273065161181f04c,
this fixes the the RCS merge to git-merge-file conversion in
commit e2b70087.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
---
 git-cvsserver.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 2a8447e..df39512 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -946,7 +946,7 @@ sub req_update
 
             $log->debug("Temporary directory for merge is $dir");
 
-            my $return = system("git merge-file", $file_local, $file_old, $file_new);
+            my $return = system("git", "merge-file", $file_local, $file_old, $file_new);
             $return >>= 8;
 
             if ( $return == 0 )
-- 
1.4.4.2.ga184

Re: [PATCH] git-cvsserver: fix breakage when calling git merge-file

[Johannes Schindelin]

Hi,

On Tue, 19 Dec 2006, Eric Wong wrote:

> In the same vein as 8336afa563fbeff35e531396273065161181f04c, this fixes 
> the the RCS merge to git-merge-file conversion in commit e2b70087.

Ooops. I should have checked after reading 8336afa if there are more 
offenders. Alas, I checked now, and there seem none to be left. But 
everybody can see now why I try to get an all-C Git: I suck at perl.

Ciao,
Dscho

Re: [PATCH] git-cvsserver: fix breakage when calling git merge-file

[Junio C Hamano]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> On Tue, 19 Dec 2006, Eric Wong wrote:
>
>> In the same vein as 8336afa563fbeff35e531396273065161181f04c, this fixes 
>> the the RCS merge to git-merge-file conversion in commit e2b70087.
>
> Ooops. I should have checked after reading 8336afa if there are more 
> offenders. Alas, I checked now, and there seem none to be left. But 
> everybody can see now why I try to get an all-C Git: I suck at perl.

Well, I should have been more careful to begin with.  My
apologies.

And thanks both.