Denton Liu <liu.denton@xxxxxxxxx> writes:
> - {
> - 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 &&
As you are dedenting the "cat <<-EOF", the body and closing EOF
should also be dedented one level, i.e.
cat >expect <<-EOF &&
Squashed commit of the following:
...
# Conflicts:
# file
EOF
> - git cat-file commit HEAD | sed -e '1,/^$/d' >actual &&
> + git cat-file commit HEAD >tmp &&
> + sed -e '1,/^$/d' <tmp >actual &&
The intermediary file may want a name better than 'tmp', if it is to
be left behind, but this will do for now.
> test_cmp expect actual
> '
Thanks for the clean-up.
