undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t3404: use write_script

Browse Source 
The test uses hardcoded #!/bin/sh to create a pre-commit hook
script.  Because the generated script uses $(command substitution),
which is not supported by /bin/sh on some platforms (e.g. Solaris),
the resulting pre-commit always fails.

Which is not noticeable as the test that uses the hook is about
checking the behaviour of the command when the hook fails ;-), but
nevertheless it is not testing what we wanted to test.

Use write_script so that the resulting script is run under the same
shell our scripted Porcelain commands are run, which must support
the necessary $(construct).

Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2016-04-12 09:59:59 -07:00
parent a3bb8ca74c
commit 7bec7f50ae
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
t/t3404-rebase-interactive.sh
View File

@ -555,10 +555,9 @@ test_expect_success 'rebase a detached HEAD' '
test_expect_success 'rebase a commit violating pre-commit' ' test_expect_success 'rebase a commit violating pre-commit' '
mkdir -p .git/hooks && mkdir -p .git/hooks &&
PRE_COMMIT=.git/hooks/pre-commit && write_script .git/hooks/pre-commit <<-\EOF &&
echo "#!/bin/sh" > $PRE_COMMIT && test -z "$(git diff --cached --check)"
echo "test -z \"\$(git diff --cached --check)\"" >> $PRE_COMMIT && EOF
chmod a+x $PRE_COMMIT &&
echo "monde! " >> file1 && echo "monde! " >> file1 &&
test_tick && test_tick &&
test_must_fail git commit -m doesnt-verify file1 && test_must_fail git commit -m doesnt-verify file1 &&