diff options
| author |  Frank Lichtenheld <frank@lichtenheld.de> | 2007-05-02 02:43:14 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2007-05-02 10:41:52 -0700 |
| commit | a7da9adb1ff4e2a378fdb2eb486a83ee2d68c847 (patch) | |
| tree | 938a3699aeb0ecfbed0cf56c24e8de0a5ae65475 | |
| parent | Fix compilation of test-delta (diff) | |
| download | tgif-a7da9adb1ff4e2a378fdb2eb486a83ee2d68c847.tar.xz | |
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>
| -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 25816c5a21..3501c1bc3a 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}, |