summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgit-cvsserver.perl2
-rw-r--r--test-delta.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 087e3ab..3e7bf5b 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},
diff --git a/test-delta.c b/test-delta.c
index 16595ef..3d885ff 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) <from_file> <data_file> <out_file>";
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;
}