From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 10 May 2009 17:45:52 +0000 (-0700)
Subject: mktree: do not barf on a submodule commit
X-Git-Tag: v1.6.4-rc0~99^2~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ad87b5dd93f61a046236febf1becc78d0ad6452a;p=git.git

mktree: do not barf on a submodule commit

It is perfectly normal if a tree entry points at a missing commit as long
as the mode of the entry says it is a submodule.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-mktree.c b/builtin-mktree.c
index 133ab4b0f..17cdb3d63 100644
--- a/builtin-mktree.c
+++ b/builtin-mktree.c
@@ -89,9 +89,16 @@ static void mktree_line(char *buf, size_t len, int line_termination)
 	    ntr[41] != '\t' ||
 	    get_sha1_hex(ntr + 1, sha1))
 		die("input format error: %s", buf);
-	type = sha1_object_info(sha1, NULL);
+
+	/* It is perfectly normal if we do not have a commit from a submodule */
+	if (!S_ISGITLINK(mode))
+		type = sha1_object_info(sha1, NULL);
+	else
+		type = OBJ_COMMIT;
+
 	if (type < 0)
 		die("object %s unavailable", sha1_to_hex(sha1));
+
 	*ntr++ = 0; /* now at the beginning of SHA1 */
 	if (type != type_from_string(ptr))
 		die("object type %s mismatch (%s)", ptr, typename(type));