t8014: avoid git command in upstream pipe
diff mbox series

Message ID 20190616204441.5400-1-michael@platin.gs
State New
Headers show
Series
  • t8014: avoid git command in upstream pipe
Related show

Commit Message

Michael Platings June 16, 2019, 8:44 p.m. UTC
From: Michael Platings <michael@platin.gs>

Use an intermediate file between between git blame and sed to avoid
git blame's exit code being hidden.

Signed-off-by: Michael Platings <michael@platin.gs>
---
 t/t8014-blame-ignore-fuzzy.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

Comments

Barret Rhoden June 17, 2019, 3:03 p.m. UTC | #1
On 6/16/19 4:44 PM, michael@platin.gs wrote:
> From: Michael Platings <michael@platin.gs>
> 
> Use an intermediate file between between git blame and sed to avoid
> git blame's exit code being hidden.

Thanks, Michael.  I'll squash this for the next version.

Barret


> 
> Signed-off-by: Michael Platings <michael@platin.gs>
> ---
>   t/t8014-blame-ignore-fuzzy.sh | 13 +++++++++----
>   1 file changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/t/t8014-blame-ignore-fuzzy.sh b/t/t8014-blame-ignore-fuzzy.sh
> index 1ff59624e9..6f1a94caef 100755
> --- a/t/t8014-blame-ignore-fuzzy.sh
> +++ b/t/t8014-blame-ignore-fuzzy.sh
> @@ -332,7 +332,9 @@ test_expect_success setup '
>   for i in $(test_seq 2 $last_test); do
>   	eval title="\$title$i"
>   	test_expect_success "$title" \
> -	"git blame -M9 --ignore-rev $IGNOREME $i | sed -e \"$pick_author\" >actual && test_cmp expected$i actual"
> +	"git blame -M9 --ignore-rev $IGNOREME $i >output &&
> +	sed -e \"$pick_author\" output >actual &&
> +	test_cmp expected$i actual"
>   done
>   
>   # This invoked a null pointer dereference when the chunk callback was called
> @@ -357,7 +359,8 @@ test_expect_success 'Diff chunks with no suspects' '
>   
>   	test_write_lines 1 1 >expected &&
>   
> -	git blame --ignore-rev $REV_2 --ignore-rev $REV_3 file | sed -e "$pick_author" >actual &&
> +	git blame --ignore-rev $REV_2 --ignore-rev $REV_3 file >output &&
> +	sed -e "$pick_author" output >actual &&
>   
>   	test_cmp expected actual
>   	'
> @@ -387,7 +390,8 @@ test_expect_success 'position matching' '
>   
>   	test_write_lines 1 1 2 2 >expected &&
>   
> -	git blame --ignore-rev $REV_3 --ignore-rev $REV_4 file2 | sed -e "$pick_author" >actual &&
> +	git blame --ignore-rev $REV_3 --ignore-rev $REV_4 file2 >output &&
> +	sed -e "$pick_author" output >actual &&
>   
>   	test_cmp expected actual
>   	'
> @@ -424,7 +428,8 @@ test_expect_success 'preserve order' '
>   
>   	test_write_lines 1 2 3 >expected &&
>   
> -	git blame --ignore-rev $REV_4 --ignore-rev $REV_5 file3 | sed -e "$pick_author" >actual &&
> +	git blame --ignore-rev $REV_4 --ignore-rev $REV_5 file3 >output &&
> +	sed -e "$pick_author" output >actual &&
>   
>   	test_cmp expected actual
>   	'
>

Patch
diff mbox series

diff --git a/t/t8014-blame-ignore-fuzzy.sh b/t/t8014-blame-ignore-fuzzy.sh
index 1ff59624e9..6f1a94caef 100755
--- a/t/t8014-blame-ignore-fuzzy.sh
+++ b/t/t8014-blame-ignore-fuzzy.sh
@@ -332,7 +332,9 @@  test_expect_success setup '
 for i in $(test_seq 2 $last_test); do
 	eval title="\$title$i"
 	test_expect_success "$title" \
-	"git blame -M9 --ignore-rev $IGNOREME $i | sed -e \"$pick_author\" >actual && test_cmp expected$i actual"
+	"git blame -M9 --ignore-rev $IGNOREME $i >output &&
+	sed -e \"$pick_author\" output >actual &&
+	test_cmp expected$i actual"
 done
 
 # This invoked a null pointer dereference when the chunk callback was called
@@ -357,7 +359,8 @@  test_expect_success 'Diff chunks with no suspects' '
 
 	test_write_lines 1 1 >expected &&
 
-	git blame --ignore-rev $REV_2 --ignore-rev $REV_3 file | sed -e "$pick_author" >actual &&
+	git blame --ignore-rev $REV_2 --ignore-rev $REV_3 file >output &&
+	sed -e "$pick_author" output >actual &&
 
 	test_cmp expected actual
 	'
@@ -387,7 +390,8 @@  test_expect_success 'position matching' '
 
 	test_write_lines 1 1 2 2 >expected &&
 
-	git blame --ignore-rev $REV_3 --ignore-rev $REV_4 file2 | sed -e "$pick_author" >actual &&
+	git blame --ignore-rev $REV_3 --ignore-rev $REV_4 file2 >output &&
+	sed -e "$pick_author" output >actual &&
 
 	test_cmp expected actual
 	'
@@ -424,7 +428,8 @@  test_expect_success 'preserve order' '
 
 	test_write_lines 1 2 3 >expected &&
 
-	git blame --ignore-rev $REV_4 --ignore-rev $REV_5 file3 | sed -e "$pick_author" >actual &&
+	git blame --ignore-rev $REV_4 --ignore-rev $REV_5 file3 >output &&
+	sed -e "$pick_author" output >actual &&
 
 	test_cmp expected actual
 	'