[PATCH v5 2/4] t7600: clean up 'merge --squash c3 with c7' test
From: Denton Liu <hidden>
Date: 2018-12-25 13:56:19
Subsystem:
the rest · Maintainer:
Linus Torvalds
This cleans up the original test by removing some unnecessary braces and removing a pipe. Helped-by: SZEDER Gábor [off-list ref] Signed-off-by: Denton Liu <redacted> --- t/t7600-merge.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 106148254d..d879efd330 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh@@ -233,8 +233,7 @@ test_expect_success 'merge --squash c3 with c7' ' cat result.9z >file && git commit --no-edit -a && - { - cat <<-EOF + cat >expect <<-EOF && Squashed commit of the following: $(git show -s c7)
@@ -242,8 +241,8 @@ test_expect_success 'merge --squash c3 with c7' ' # Conflicts: # file EOF - } >expect && - git cat-file commit HEAD | sed -e '1,/^$/d' >actual && + git cat-file commit HEAD >tmp && + sed -e '1,/^$/d' <tmp >actual && test_cmp expect actual '
--
2.20.1