Re: [PATCH 2/2] Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.

[Jens Lehmann <Jens.Lehmann@web.de>]

Am 24.07.2011 03:07, schrieb Jon Seymour:
> diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
> index f08c5b0..6d6c992 100644
> --- a/builtin/ls-tree.c
> +++ b/builtin/ls-tree.c
> @@ -120,7 +120,7 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)
>  {
>  	unsigned char sha1[20];
>  	struct tree *tree;
> -	int i, full_tree = 0;
> +	int i, full_tree = 0, err;
>  	const struct option ls_tree_options[] = {
>  		OPT_BIT('d', NULL, &ls_options, "only show trees",
>  			LS_TREE_ONLY),
> @@ -173,7 +173,7 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)
>  	tree = parse_tree_indirect(sha1);
>  	if (!tree)
>  		die("not a tree object");
> -	read_tree_recursive(tree, "", 0, 0, &pathspec, show_tree, NULL);
> +	err = read_tree_recursive(tree, "", 0, 0, &pathspec, show_tree, NULL);
>  
> -	return 0;
> +	return err;
>  }

Nit: Is it really necessary to introduce a new variable "err" for that? Looks
like a "return read_tree_recursive(...)" would suffice here ...