Merge branch 'maint'
* maint: cvsserver: Handle re-added files correctly Fix compilation of test-delta
This commit is contained in:
commit
6644d2f2c4
@ -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},
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user