Junio C Hamano <gits...@pobox.com> writes:
> Jeff King <p...@peff.net> writes:
> ...
>> Looks good and is the minimal change. I kind of wonder if the example
>> would be more clear, though, as just:
>>
>> write_script .git/hooks/pre-commit <<-\EOF &&
>> exit 1
>> EOF
>> echo whatever >file1 &&
>> ...
>>
>> I don't think we ever actually need the pre-commit check to pass, as we
>> simply override it with --no-verify. But I dunno. Maybe people find it
>> easier to read with a pseudo-realistic example (it took me a minute to
>> realize the trailing whitespace in the content was important).
>
> I was mostly worried about closing the door for future enhancement
> where there are multiple commits to be replayed, some of which fail
> and others pass the test. Unconditional "exit 1" would have to be
> reverted when it happens.
>
>> It could also stand to clean up its hook with test_when_finished. The
>> next test resorts to "rm -rf" on the hooks directory at the beginning.
>> Yuck.
>
> Yeah, that may be an accident waiting to happen.
In any case, lest we forget...
-- >8 --
Subject: [PATCH] t3404: use write_script
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 <p...@peff.net>
Signed-off-by: Junio C Hamano <gits...@pobox.com>
---
t/t3404-rebase-interactive.sh | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 544f9ad..d6d65a3 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -555,10 +555,9 @@ test_expect_success 'rebase a detached HEAD' '
test_expect_success 'rebase a commit violating pre-commit' '
mkdir -p .git/hooks &&
- PRE_COMMIT=.git/hooks/pre-commit &&
- echo "#!/bin/sh" > $PRE_COMMIT &&
- echo "test -z \"\$(git diff --cached --check)\"" >> $PRE_COMMIT &&
- chmod a+x $PRE_COMMIT &&
+ write_script .git/hooks/pre-commit <<-\EOF &&
+ test -z "$(git diff --cached --check)"
+ EOF
echo "monde! " >> file1 &&
test_tick &&
test_must_fail git commit -m doesnt-verify file1 &&
--
2.8.1-339-gc925d85
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
