Re: [PATCH 2/2] object-file: return error on index-pack abnormal exit

[Justin Tobler <jltobler@gmail.com>]

On 26/11/10 11:27PM, Kaartic Sivaraam wrote:
> It is an improvement indeed. No arguments about it. I was just wondering if
> his change could also include a change like this on top:
> 
> diff --git a/object-file.c b/object-file.c
> index e04ce0bc11..c52004014f 100644
> --- a/object-file.c
> +++ b/object-file.c
> @@ -1429,7 +1429,7 @@ static int odb_transaction_files_write_pack(struct
> odb_transaction *base,
>  	struct pack_header hdr;
>  	const char *hdr_err;
>  	int err_fd = opts->err_fd;
> -	int ret;
> +	int ret = -1;
> 
>  	hdr_err = parse_pack_header(&hdr, pack_fd);
>  	if (hdr_err) {
> @@ -1498,13 +1498,11 @@ static int odb_transaction_files_write_pack(struct
> odb_transaction *base,
> 
>  		if (finish_command(&child)) {
>  			strbuf_addstr(err_msg, "index-pack abnormal exit");
> -			ret = -1;
>  			goto out;
>  		}
> 
>  		if (report_err) {
>  			strbuf_addstr(err_msg, "index-pack failed to report pack name");
> -			ret = -1;
>  			goto out;
>  		}
> 
> 
> But, I would agree that this is a digression.

I think this is mostly just a matter of style preference. I'm inclined
to leave it as-is, but an open to change it anyone feels strongly.

-Justin