Junio C Hamano <[email protected]> writes:
> Junio C Hamano <[email protected]> writes:
>
>> Phillip Wood <[email protected]> writes:
>>
>>> From: Phillip Wood <[email protected]>
>>>
>>> I've revised the second two tests as Johannes suggested to drop the
>>> sed script. The first one is unchanged.
>>>
>>> Phillip Wood (3):
>>> rebase -i: Add test for reflog message
>>> rebase: Add regression tests for console output
>>> rebase: Add more regression tests for console output
>>>
>>> t/t3404-rebase-interactive.sh | 7 +++
>>> t/t3420-rebase-autostash.sh | 138
>>> ++++++++++++++++++++++++++++++++++++++++--
>>> 2 files changed, 141 insertions(+), 4 deletions(-)
>>
>> Thanks (and thanks for Dscho for reading it over).
>>
>> Unfortunately this breaks unless your shell is bash (I didn't have
>> time to look further into it), i.e. "make SHELL_PATH=/bin/dash test"
>
> This is the bash-ism that broke it, I think.
>
> create_expected_success_interactive() {
> cr=$'\r' &&
> cat >expected <<-EOF
FYI, I've queued the following as a fix-up and pushed the result
out.
t/t3420-rebase-autostash.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh
index 325ec75353..801bce25da 100755
--- a/t/t3420-rebase-autostash.sh
+++ b/t/t3420-rebase-autostash.sh
@@ -45,7 +45,7 @@ create_expected_success_am() {
}
create_expected_success_interactive() {
- cr=$'\r' &&
+ cr=$(echo . | tr '.' '\015') &&
cat >expected <<-EOF
$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
HEAD is now at $(git rev-parse --short feature-branch) third commit
@@ -103,7 +103,7 @@ create_expected_failure_am() {
}
create_expected_failure_interactive() {
- cr=$'\r' &&
+ cr=$(echo . | tr '.' '\015') &&
cat >expected <<-EOF
$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
HEAD is now at $(git rev-parse --short feature-branch) third commit
--
2.13.1-591-gf514f8f1c0
