diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-02 11:27:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-02 11:27:31 -0700 |
| commit | 6644d2f2c490f8a7081bd7e5da12c19400c8b6ef (patch) | |
| tree | 890dc4da460811b56e00189f5a12de7ea26d4603 /git-cvsserver.perl | |
| parent | b3431bc603df74cfe2da56e9a5c3f60327dd56b9 (diff) | |
| parent | 7a33b0bfced9cfcea785dac5ddf189d937a42446 (diff) | |
| download | git-6644d2f2c490f8a7081bd7e5da12c19400c8b6ef.tar.gz | |
Merge branch 'maint'
* maint:
cvsserver: Handle re-added files correctly
Fix compilation of test-delta
Diffstat (limited to 'git-cvsserver.perl')
| -rwxr-xr-x | git-cvsserver.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsserver.perl b/git-cvsserver.perl index 087e3abaef..3e7bf5b54a 100755 --- a/git-cvsserver.perl +++ b/git-cvsserver.perl @@ -2519,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}, |