From adb7b5fc86d96fc2baf5a5c0ce12fb581b3ad275 Mon Sep 17 00:00:00 2001 From: Martin Koegler Date: Tue, 1 May 2007 11:47:55 +0200 Subject: [PATCH 1/2] Fix compilation of test-delta The code used write_in_full() without pulling its declarations from the header file. When header is included, usage[] collides with usage() function. Signed-off-by: Martin Koegler Signed-off-by: Junio C Hamano --- test-delta.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test-delta.c b/test-delta.c index 16595ef0a..3d885ff37 100644 --- a/test-delta.c +++ b/test-delta.c @@ -10,8 +10,9 @@ #include "git-compat-util.h" #include "delta.h" +#include "cache.h" -static const char usage[] = +static const char usage_str[] = "test-delta (-d|-p) "; int main(int argc, char *argv[]) @@ -22,7 +23,7 @@ int main(int argc, char *argv[]) unsigned long from_size, data_size, out_size; if (argc != 5 || (strcmp(argv[1], "-d") && strcmp(argv[1], "-p"))) { - fprintf(stderr, "Usage: %s\n", usage); + fprintf(stderr, "Usage: %s\n", usage_str); return 1; } From a7da9adb1ff4e2a378fdb2eb486a83ee2d68c847 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Wed, 2 May 2007 02:43:14 +0200 Subject: [PATCH 2/2] 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 Signed-off-by: Junio C Hamano --- git-cvsserver.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-cvsserver.perl b/git-cvsserver.perl index 25816c5a2..3501c1bc3 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},