X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=convert-objects.c;h=a67d6b479ec57816de1b259f9efed2258e999703;hb=7612a1efdb0c0806b43db10ce784707aae874340;hp=57de37faa53df5fb84247e2fd7486a108039676e;hpb=8e4402592574d630cdb5ab4f55a1b7131802ff72;p=git.git

diff --git a/convert-objects.c b/convert-objects.c
index 57de37fa..a67d6b47 100644
--- a/convert-objects.c
+++ b/convert-objects.c
@@ -21,8 +21,7 @@ static struct entry * convert_entry(unsigned char *sha1);
 
 static struct entry *insert_new(unsigned char *sha1, int pos)
 {
-	struct entry *new = xmalloc(sizeof(struct entry));
-	memset(new, 0, sizeof(*new));
+	struct entry *new = xcalloc(1, sizeof(struct entry));
 	memcpy(new->old_sha1, sha1, 20);
 	memmove(convert + pos + 1, convert + pos, (nr_convert - pos) * sizeof(struct entry *));
 	convert[pos] = new;
@@ -322,8 +321,10 @@ int main(int argc, char **argv)
 
 	setup_git_directory();
 
-	if (argc != 2 || get_sha1(argv[1], sha1))
+	if (argc != 2)
 		usage("git-convert-objects <sha1>");
+	if (get_sha1(argv[1], sha1))
+		die("Not a valid object name %s", argv[1]);
 
 	entry = convert_entry(sha1);
 	printf("new sha1: %s\n", sha1_to_hex(entry->new_sha1));