summaryrefslogtreecommitdiff
path: root/convert-cache.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-10 07:10:18 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-10 07:10:18 (GMT)
commitf69714c38c6f3296a4bfba0d057e0f1605373f49 (patch)
tree2d850f14f62d33ed514e2b197b63fe459ff20d37 /convert-cache.c
parentedee414c3e5a546aae3dd1529f397df949713305 (diff)
parentc35a7b8d806317dc1762e36561cbd31c2530dd9c (diff)
downloadgit-f69714c38c6f3296a4bfba0d057e0f1605373f49.zip
git-f69714c38c6f3296a4bfba0d057e0f1605373f49.tar.gz
git-f69714c38c6f3296a4bfba0d057e0f1605373f49.tar.bz2
Merge with master.
This merges commit c35a7b8d806317dc1762e36561cbd31c2530dd9c from master into our head commit edee414c3e5a546aae3dd1529f397df949713305 Sincerely, jit-merge command.
Diffstat (limited to 'convert-cache.c')
-rw-r--r--convert-cache.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/convert-cache.c b/convert-cache.c
index 8916a36..95f0302 100644
--- a/convert-cache.c
+++ b/convert-cache.c
@@ -60,7 +60,7 @@ static void convert_ascii_sha1(void *buffer)
struct entry *entry;
if (get_sha1_hex(buffer, sha1))
- die("expected sha1, got '%s'", buffer);
+ die("expected sha1, got '%s'", (char*) buffer);
entry = convert_entry(sha1);
memcpy(buffer, sha1_to_hex(entry->new_sha1), 40);
}
@@ -272,7 +272,7 @@ static void convert_commit(void *buffer, unsigned long size, unsigned char *resu
unsigned long orig_size = size;
if (memcmp(buffer, "tree ", 5))
- die("Bad commit '%s'", buffer);
+ die("Bad commit '%s'", (char*) buffer);
convert_ascii_sha1(buffer+5);
buffer += 46; /* "tree " + "hex sha1" + "\n" */
while (!memcmp(buffer, "parent ", 7)) {