diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-11 18:43:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-11 18:43:01 -0700 |
| commit | 566f5b217df73d6a642a0857cc5c13c11f84e7c3 (patch) | |
| tree | ff172bf2658ca4e1f4c88d30bb80c8af17f29b2d /git-cvsserver.perl | |
| parent | b06dcf8cb83a9b7655bad5f0f6d84e68fc78beb3 (diff) | |
| parent | 9b11d24d4156e0b2246383faad16eb8aa0caeefb (diff) | |
| download | git-566f5b217df73d6a642a0857cc5c13c11f84e7c3.tar.gz | |
Merge branch 'maint'
* maint:
GIT 1.5.1.1
cvsserver: Fix handling of diappeared files on update
fsck: do not complain on detached HEAD.
(encode_85, decode_85): Mark source buffer pointer as "const".
Diffstat (limited to 'git-cvsserver.perl')
| -rwxr-xr-x | git-cvsserver.perl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-cvsserver.perl b/git-cvsserver.perl index 68aa75255e..25816c5a21 100755 --- 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"); |