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>
Junio C Hamano committed
May 10, 2009 at 10:45 UTC
ad87b5dd93f61a046236febf1becc78d0ad6452a
1 file changed
+8
-1
builtin-mktree.c
+8
-1
@@ -89,9 +89,16 @@ static void mktree_line(char *buf, size_t len, int line_termination)
89
ntr[41] != '\t' ||
90
get_sha1_hex(ntr + 1, sha1))
91
die("input format error: %s", buf);
92
- type = sha1_object_info(sha1, NULL);
92
+
93
+ /* It is perfectly normal if we do not have a commit from a submodule */
94
+ if (!S_ISGITLINK(mode))
95
+ type = sha1_object_info(sha1, NULL);
96
+ else
97
+ type = OBJ_COMMIT;
98
+
99
if (type < 0)
100
die("object %s unavailable", sha1_to_hex(sha1));
101
+
102
*ntr++ = 0; /* now at the beginning of SHA1 */
103
if (type != type_from_string(ptr))
104
die("object type %s mismatch (%s)", ptr, typename(type));