Re: [PATCH v2 05/17] mktree: read textual tree representation with strbuf_getline_crlf()

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jan 4, 2016, 12:27 UTC
Message-ID: <alpine.DEB.2.20.1601041316370.14434@virtualbox>
In-Reply-To: <1450303398-25900-6-git-send-email-gitster@pobox.com>

Hi Junio,

On Wed, 16 Dec 2015, Junio C Hamano wrote:

Show 15 quoted lines

> diff --git a/builtin/mktree.c b/builtin/mktree.c
> index a964d6b..c6cafb6 100644
> --- a/builtin/mktree.c
> +++ b/builtin/mktree.c
> @@ -157,7 +157,9 @@ int cmd_mktree(int ac, const char **av, const char *prefix)
>  
>  	while (!got_eof) {
>  		while (1) {
> -			if (strbuf_getline(&sb, stdin, line_termination) == EOF) {
> +			if ((line_termination
> +			     ? strbuf_getline_crlf(&sb, stdin)
> +			     : strbuf_getline(&sb, stdin, '\0')) == EOF) {
>  				got_eof = 1;
>  				break;
>  			}

Here also, I would recommend to change the logic to talk about nul_delimited instead of line_termination first, and only then introduce the change to call two different strbuf_* functions.

Ciao, Dscho