Skip to content

Commit

Permalink
t7502: clean up fake_editor tests
Browse files Browse the repository at this point in the history
Using write_script saves us a few lines of code, and means
we consistently use $SHELL_PATH.

We can also drop the setting of the $pwd variable from
$(pwd). In the first instance, there is no reason to use it
(we can just use $(pwd) directly two lines later, since we
are interpolating the here-document). In the second
instance, it is totally pointless and probably just a
cut-and-paste from the first instance.

Finally, we can use a non-interpolating here document for
the final script, which saves some quoting.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jeff King authored and Junio C Hamano committed Jul 26, 2012
1 parent 18502e3 commit a9ebc43
Showing 1 changed file with 7 additions and 13 deletions.
20 changes: 7 additions & 13 deletions t/t7502-commit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -266,13 +266,10 @@ test_expect_success 'committer is automatic' '
test_i18ncmp expect actual
'

pwd=`pwd`
cat >> .git/FAKE_EDITOR << EOF
#! /bin/sh
echo editor started > "$pwd/.git/result"
write_script .git/FAKE_EDITOR <<EOF
echo editor started > "$(pwd)/.git/result"
exit 0
EOF
chmod +x .git/FAKE_EDITOR

test_expect_success 'do not fire editor in the presence of conflicts' '
Expand Down Expand Up @@ -300,9 +297,7 @@ test_expect_success 'do not fire editor in the presence of conflicts' '
test "$(cat .git/result)" = "editor not started"
'

pwd=`pwd`
cat >.git/FAKE_EDITOR <<EOF
#! $SHELL_PATH
write_script .git/FAKE_EDITOR <<EOF
# kill -TERM command added below.
EOF

Expand Down Expand Up @@ -339,13 +334,12 @@ test_expect_success 'A single-liner subject with a token plus colon is not a foo
'

cat >.git/FAKE_EDITOR <<EOF
#!$SHELL_PATH
mv "\$1" "\$1.orig"
write_script .git/FAKE_EDITOR <<\EOF
mv "$1" "$1.orig"
(
echo message
cat "\$1.orig"
) >"\$1"
cat "$1.orig"
) >"$1"
EOF

echo '## Custom template' >template
Expand Down

0 comments on commit a9ebc43

Please sign in to comment.