projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Add the merge test Linus called "test script from hell".
[git.git]
/
convert-cache.c
diff --git
a/convert-cache.c
b/convert-cache.c
index
631d1aa
..
93e477a
100644
(file)
--- a/
convert-cache.c
+++ b/
convert-cache.c
@@
-99,7
+99,7
@@
static int write_subdirectory(void *buffer, unsigned long size, const char *base
continue;
}
continue;
}
- newlen += sprintf(new + newlen, "%o %.*s", S_IFDIR,
slash - path
, path);
+ newlen += sprintf(new + newlen, "%o %.*s", S_IFDIR,
(int)(slash - path)
, path);
new[newlen++] = 0;
sha1 = (unsigned char *)(new + newlen);
newlen += 20;
new[newlen++] = 0;
sha1 = (unsigned char *)(new + newlen);
newlen += 20;
@@
-303,7
+303,7
@@
int main(int argc, char **argv)
unsigned char sha1[20];
struct entry *entry;
unsigned char sha1[20];
struct entry *entry;
- if (argc != 2 || get_sha1
_hex
(argv[1], sha1))
+ if (argc != 2 || get_sha1(argv[1], sha1))
usage("convert-cache <sha1>");
entry = convert_entry(sha1);
usage("convert-cache <sha1>");
entry = convert_entry(sha1);