X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=upload-pack.c;h=47560c9527b9c17db34f10e78d7c1f0d99b746e1;hb=b19ee24b22b3c1d08f06e8f868f11d9e8639fd30;hp=3cdf4288b838c045b4524c7dd906525a39f0e67d;hpb=b19696c2e7c3e753777189100b2ac09c9e04080b;p=git.git

diff --git a/upload-pack.c b/upload-pack.c
index 3cdf4288..47560c95 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -46,7 +46,7 @@ static void create_pack_file(void)
 	if (!pid) {
 		int i;
 		int args;
-		char **argv;
+		const char **argv;
 		char *buf;
 		char **p;
 
@@ -56,9 +56,9 @@ static void create_pack_file(void)
 		}
 		else
 			args = nr_has + nr_needs + 5;
-		argv = xmalloc(args * sizeof(char *));
+		p = xmalloc(args * sizeof(char *));
+		argv = (const char **) p;
 		buf = xmalloc(args * 45);
-		p = argv;
 
 		dup2(fd[1], 1);
 		close(0);
@@ -221,6 +221,9 @@ static int send_ref(const char *refname, const unsigned char *sha1)
 	static char *capabilities = "multi_ack thin-pack";
 	struct object *o = parse_object(sha1);
 
+	if (!o)
+		die("git-upload-pack: cannot find object %s:", sha1_to_hex(sha1));
+
 	if (capabilities)
 		packet_write(1, "%s %s%c%s\n", sha1_to_hex(sha1), refname,
 			0, capabilities);