cvsserver: Fix handling of diappeared files on update

flichtenheld · Junio C Hamano · commit cb52d9a1fbb2 · 2007-04-11T16:55:33.000-07:00
Only send a modified response if the client sent a
"Modified" entry. This fixes the case where the
file was locally deleted on the client without
being removed from CVS. In this case the client
will only have sent the Entry for the file but nothing
else.

Signed-off-by: Frank Lichtenheld &lt;frank@lichtenheld.de&gt;
Acked-by: Martin Langhoff &lt;martin@catalyst.net.nz&gt;
Acked-by: Daniel Barkalow &lt;barkalow@iabervon.org&gt;
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
@@ -843,6 +843,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");

Original file line number	Diff line number	Diff line change
`@@ -843,6 +843,7 @@ sub req_update`
`843`	`843`	`if ( defined ( $wrev )`
`844`	`844`	`and defined($meta->{revision})`
`845`	`845`	`and $wrev == $meta->{revision}`
	`846`	`+ and defined($state->{entries}{$filename}{modified_hash})`
`846`	`847`	`and not exists ( $state->{opt}{C} ) )`
`847`	`848`	`{`
`848`	`849`	`$log->info("Tell the client the file is modified");`