diff options
| author | Alexey Shumkin <alex.crezoff@gmail.com> | 2013-07-05 16:01:48 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-05 11:40:18 -0700 |
| commit | 17cc2ef1c5f160056f5ca8cf4bd795ddd9b76bd3 (patch) | |
| tree | a6b95f53a3b8e1f1f576c8db8950a53714ccd203 /t/t7102-reset.sh | |
| parent | f3445f781f95ca4a7d59028aa7b7457fa925f577 (diff) | |
| download | git-17cc2ef1c5f160056f5ca8cf4bd795ddd9b76bd3.tar.gz | |
t4205, t6006, t7102: make functions better readable
Function 'test_format' has become harder to read after its change in
de6029a2 (pretty: Add failing tests: --format output should honor
logOutputEncoding, 2013-06-26). Simplify it by moving its "should we
expect it to fail?" parameter to the end.
Note, current code does not use this last parameter as far as there
are no tests expected to fail. We can keep that for future use.
Also, reformat comments.
Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com>
Improved-by: Johannes Sixt <j.sixt@viscovery.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7102-reset.sh')
| -rwxr-xr-x | t/t7102-reset.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh index 2ef96e9240..4f1c9f9c7f 100755 --- a/t/t7102-reset.sh +++ b/t/t7102-reset.sh @@ -10,14 +10,16 @@ Documented tests for git reset' . ./test-lib.sh commit_msg () { - # String "modify 2nd file (changed)" partly in German(translated with Google Translate), + # String "modify 2nd file (changed)" partly in German + # (translated with Google Translate), # encoded in UTF-8, used as a commit log message below. - msg=$(printf "modify 2nd file (ge\303\244ndert)") + msg="modify 2nd file (ge\303\244ndert)\n" if test -n "$1" then - msg=$(echo $msg | iconv -f utf-8 -t $1) + printf "$msg" | iconv -f utf-8 -t "$1" + else + printf "$msg" fi - echo $msg } test_expect_success 'creating initial files and commits' ' |