]> asedeno.scripts.mit.edu Git - git.git/commitdiff
cvsserver: fix revision number during file adds
authorMartin Langhoff <martin@catalyst.net.nz>
Tue, 9 Jan 2007 02:10:41 +0000 (15:10 +1300)
committerJunio C Hamano <junkio@cox.net>
Tue, 9 Jan 2007 05:45:13 +0000 (21:45 -0800)
With this patch, cvs add / cvs commit echoes back to the client
the correct file version (1.1) so that the file in the checkout
is recognised as up-to-date.

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-cvsserver.perl

index eb98fa0857cb9e7dffd51ef5bb4a7abc0f6e3411..a33a876ff652fea5a0a8933b919982557a7093de 100755 (executable)
@@ -1181,12 +1181,15 @@ sub req_ci
         $filename = filecleanup($filename);
 
         my $meta = $updater->getmeta($filename);
+       unless (defined $meta->{revision}) {
+         $meta->{revision} = 1;
+       }
 
         my ( $filepart, $dirpart ) = filenamesplit($filename, 1);
 
         $log->debug("Checked-in $dirpart : $filename");
 
-        if ( $meta->{filehash} eq "deleted" )
+        if ( defined $meta->{filehash} && $meta->{filehash} eq "deleted" )
         {
             print "Remove-entry $dirpart\n";
             print "$filename\n";