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 | |
| parent | Don't use seq in tests, not everyone has it (diff) | |
| parent | Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint (diff) | |
| download | tgif-6644d2f2c490f8a7081bd7e5da12c19400c8b6ef.tar.xz | |
Merge branch 'maint'
* maint:
cvsserver: Handle re-added files correctly
Fix compilation of test-delta
| -rwxr-xr-x | git-cvsserver.perl | 2 | ||||
| -rw-r--r-- | test-delta.c | 5 |
2 files changed, 4 insertions, 3 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}, diff --git a/test-delta.c b/test-delta.c index 16595ef0a9..3d885ff37e 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; } |