Re: [PATCH] t4215: don't put git commands upstream of pipe

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 12, 2019, 06:57 UTC
Message-ID: <xmqqzhh1eg57.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <8e950ddfba3fa0f6d0551a153228548da6af6117.1573520653.git.liu.denton@gmail.com>

Denton Liu <liu.denton@gmail.com> writes:

Show 7 quoted lines

> A little late to the party but since this cleanup hasn't been done yet,
> let's do it now. We can apply this patch to the tip of
> 'jc/log-graph-simplify'.
> ...
> -	git log --graph --pretty=tformat:%s | sed "s/ *$//" >actual &&
> +	git log --graph --pretty=tformat:%s >actual.raw &&
> +	sed "s/ *$//" actual.raw >actual &&

Obviously good but I wonder if

	show_graph () {
		git log --graph --pretty=tformat:%s >actual.raw &&
		sed "s/ *$//" actual.raw &&
		rm actual.raw
	}

would help to make it even more readable without too much repetition.

Will queue; thanks.

Show 62 quoted lines

>  	test_cmp expect actual
>  '
>  
> @@ -68,7 +69,8 @@ test_expect_success 'log --graph with left-skewed merge' '
>  	git checkout 0_p && git merge --no-ff 0_s -m 0_G &&
>  	git checkout @^ && git merge --no-ff 0_q 0_r 0_t 0_p -m 0_H &&
>  
> -	git log --graph --pretty=tformat:%s | sed "s/ *$//" >actual &&
> +	git log --graph --pretty=tformat:%s >actual.raw &&
> +	sed "s/ *$//" actual.raw >actual &&
>  	test_cmp expect actual
>  '
>  
> @@ -99,7 +101,8 @@ test_expect_success 'log --graph with nested left-skewed merge' '
>  	git checkout 1_p && git merge --no-ff 1_r -m 1_G &&
>  	git checkout @^^ && git merge --no-ff 1_p -m 1_H &&
>  
> -	git log --graph --pretty=tformat:%s | sed "s/ *$//" >actual &&
> +	git log --graph --pretty=tformat:%s >actual.raw &&
> +	sed "s/ *$//" actual.raw >actual &&
>  	test_cmp expect actual
>  '
>  
> @@ -139,7 +142,8 @@ test_expect_success 'log --graph with nested left-skewed merge following normal
>  	git checkout -b 2_s @^^ && git merge --no-ff 2_q -m 2_J &&
>  	git checkout 2_p && git merge --no-ff 2_s -m 2_K &&
>  
> -	git log --graph --pretty=tformat:%s | sed "s/ *$//" >actual &&
> +	git log --graph --pretty=tformat:%s >actual.raw &&
> +	sed "s/ *$//" actual.raw >actual &&
>  	test_cmp expect actual
>  '
>  
> @@ -175,7 +179,8 @@ test_expect_success 'log --graph with nested right-skewed merge following left-s
>  	git checkout 3_p && git merge --no-ff 3_r -m 3_H &&
>  	git checkout @^^ && git merge --no-ff 3_p -m 3_J &&
>  
> -	git log --graph --pretty=tformat:%s | sed "s/ *$//" >actual &&
> +	git log --graph --pretty=tformat:%s >actual.raw &&
> +	sed "s/ *$//" actual.raw >actual &&
>  	test_cmp expect actual
>  '
>  
> @@ -210,7 +215,8 @@ test_expect_success 'log --graph with right-skewed merge following a left-skewed
>  	git merge --no-ff 4_p -m 4_G &&
>  	git checkout @^^ && git merge --no-ff 4_s -m 4_H &&
>  
> -	git log --graph --date-order --pretty=tformat:%s | sed "s/ *$//" >actual &&
> +	git log --graph --date-order --pretty=tformat:%s >actual.raw &&
> +	sed "s/ *$//" actual.raw >actual &&
>  	test_cmp expect actual
>  '
>  
> @@ -250,7 +256,8 @@ test_expect_success 'log --graph with octopus merge with column joining its penu
>  	git checkout 5_r &&
>  	git merge --no-ff 5_s -m 5_H &&
>  
> -	git log --graph --pretty=tformat:%s | sed "s/ *$//" >actual &&
> +	git log --graph --pretty=tformat:%s >actual.raw &&
> +	sed "s/ *$//" actual.raw >actual &&
>  	test_cmp expect actual
>  '