Merge branches 'jc/rev-list' and 'jc/pack-thin'

diff --git a/upload-pack.c b/upload-pack.c
index 3cdf4288b838c045b4524c7dd906525a39f0e67d..635abb371d4c86677f091551f731047b4ca08612 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -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);