diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-05-10 10:45:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-10 12:41:35 -0700 |
| commit | ad87b5dd93f61a046236febf1becc78d0ad6452a (patch) | |
| tree | a559c6bc401b8c80a74c48f7c4fc241ab211a6ee | |
| parent | builtin-mktree.c: use a helper function to handle one line of input (diff) | |
| download | tgif-ad87b5dd93f61a046236febf1becc78d0ad6452a.tar.xz | |
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>
| -rw-r--r-- | builtin-mktree.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/builtin-mktree.c b/builtin-mktree.c index 133ab4b0f8..17cdb3d63a 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)); |