Fix fmt-merge-msg counting.

diff --git a/upload-pack.c b/upload-pack.c
index d1980556ca5b9c62a76129907cc511cd5c0c6c83..3606529f61c50aa1c4d73877ccc4601ef036fcb5 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -216,6 +216,9 @@ static int send_ref(const char *refname, const unsigned char *sha1)
        static char *capabilities = "multi_ack";
        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);