summaryrefslogtreecommitdiff
path: root/git-cvsserver.perl
diff options
context:
space:
mode:
authorFrank Lichtenheld <frank@lichtenheld.de>2007-05-02 00:43:14 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-02 17:41:52 (GMT)
commita7da9adb1ff4e2a378fdb2eb486a83ee2d68c847 (patch)
tree938a3699aeb0ecfbed0cf56c24e8de0a5ae65475 /git-cvsserver.perl
parentadb7b5fc86d96fc2baf5a5c0ce12fb581b3ad275 (diff)
downloadgit-a7da9adb1ff4e2a378fdb2eb486a83ee2d68c847.zip
git-a7da9adb1ff4e2a378fdb2eb486a83ee2d68c847.tar.gz
git-a7da9adb1ff4e2a378fdb2eb486a83ee2d68c847.tar.bz2
cvsserver: Handle re-added files correctly
We can't unconditionally assign revision 1.1 to newly added files. In case the file did exist in the past and was deleted we need to honor the old revision number. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-cvsserver.perl')
-rwxr-xr-xgit-cvsserver.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 25816c5..3501c1b 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -2454,7 +2454,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},