зеркало из https://github.com/microsoft/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>
This commit is contained in:
Родитель
fe0bb5f7bc
Коммит
ad87b5dd93
|
@ -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));
|
||||
|
|
Загрузка…
Ссылка в новой задаче