From: Junio C Hamano Date: Sun, 10 May 2009 18:49:49 GMT Subject: [PATCH 4/6] mktree: do not barf on a submodule commit Message-ID: <1241981391-19639-5-git-send-email-gitster@pobox.com> In-Reply-To: <1241981391-19639-4-git-send-email-gitster@pobox.com> 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 --- builtin-mktree.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/builtin-mktree.c b/builtin-mktree.c index 133ab4b..17cdb3d 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)); -- 1.6.3.9.g6345d