[PATCH] tree-walk: be more specific about corrupt tree errors
- From
Jeff King <peff@peff.net>
- Date
- Feb 12, 2014, 19:49 UTC
- Message-ID
- <20140212194956.GA3850@sigill.intra.peff.net>
When the tree-walker runs into an error, it just calls die(), and the message is always "corrupt tree file". However, we are actually covering several cases here; let's give the user a hint about what happened.
Let's also avoid using the word "corrupt", which makes it seem like the data bit-rotted on disk. Our sha1 check would already have found that. These errors are ones of data that is malformed in the first place.
Signed-off-by: Jeff King <peff@peff.net> --- Michael and I have been looking off-list at some bogus trees (created by a non-git.git implementation). git-fsck unhelpfully dies during the tree-walk:
$ git fsck Checking object directories: 100% (256/256), done. fatal: corrupt tree file
I think in the long run we want to either teach fsck to avoid the regular tree-walker or to set a special "continue as much as you can" flag. That will let us keep going to find more errors, do our usual fsck error checks (which are more strict), and especially report on _which_ object was broken (we can't do that here because we are deep in the call stack and may not even have a real object yet).
This patch at least gives us slightly more specific error messages (both for fsck and for other commands). And it may provide a first step in clarity if we follow the "continue as much as you can" path.
tree-walk.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/tree-walk.c b/tree-walk.c index 79dba1d..d53b084 100644 --- a/tree-walk.c +++ b/tree-walk.c @@ -28,11 +28,13 @@ static void decode_tree_entry(struct tree_desc *desc, const char *buf, unsigned unsigned int mode, len; if (size < 24 || buf[size - 21]) - die("corrupt tree file"); + die("truncated tree file"); path = get_mode(buf, &mode); - if (!path || !*path) - die("corrupt tree file"); + if (!path) + die("malformed mode in tree entry"); + if (!*path) + die("empty filename in tree entry"); len = strlen(path) + 1; /* Initialize the descriptor entry */ @@ -81,7 +83,7 @@ void update_tree_entry(struct tree_desc *desc) unsigned long len = end - (const unsigned char *)buf; if (size < len) - die("corrupt tree file"); + die("truncated tree file"); buf = end; size -= len; desc->buffer = buf;
-- 1.8.5.2.500.g8060133