Merge branch 'maint'

diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index d5674caaad285a651e73d2b979fb7cb7ed72b436..3e7bf5b54afc1c9176406fc98d9e5b333d10f6aa 100755 (executable)
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -893,6 +893,7 @@ sub req_update
         if ( defined ( $wrev )
              and defined($meta->{revision})
              and $wrev == $meta->{revision}
+             and defined($state->{entries}{$filename}{modified_hash})
              and not exists ( $state->{opt}{C} ) )
         {
             $log->info("Tell the client the file is modified");
@@ -2518,7 +2519,7 @@ sub update
                     #$log->debug("ADDED    $name");
                     $head->{$name} = {
                         name => $name,
-                        revision => 1,
+                        revision => $head->{$name}{revision} ? $head->{$name}{revision}+1 : 1,
                         filehash => $hash,
                         commithash => $commit->{hash},
                         modified => $commit->{date},