kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Junio C Hamano 2009-05-10 10:45:52 -07:00
parent fe0bb5f7bc
commit ad87b5dd93
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builtin-mktree.c
View File

@ -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));