Skip to content

Commit

Permalink
cvsserver: Fix handling of diappeared files on update
Browse files Browse the repository at this point in the history
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 <frank@lichtenheld.de>
Acked-by: Martin Langhoff <martin@catalyst.net.nz>
Acked-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Frank Lichtenheld authored and Junio C Hamano committed Apr 11, 2007
1 parent 8eb2d0b commit cb52d9a
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions git-cvsserver.perl
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit cb52d9a

Please sign in to comment.