diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-12-15 13:00:25 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-12-15 13:00:25 +0900 |
| commit | b21ebb671bb7dea8d342225f0d66c41f4e54d5ca (patch) | |
| tree | d5e62fb29ab9d5a80a8d391dbc5b39971dfcce51 /t | |
| parent | Prepare for 2.21 cycle to start soonish (diff) | |
| parent | Git 2.20.1 (diff) | |
| download | tgif-b21ebb671bb7dea8d342225f0d66c41f4e54d5ca.tar.xz | |
Sync with Git 2.20.1
* maint:
Git 2.20.1
.gitattributes: ensure t/oid-info/* has eol=lf
t9902: 'send-email' test case requires PERL
t4256: mark support files as LF-only
parse-options: fix SunCC compiler warning
help -a: handle aliases with long names gracefully
help.h: fix coding style
run-command: report exec failure
Diffstat (limited to 't')
| -rw-r--r-- | t/.gitattributes | 1 | ||||
| -rwxr-xr-x | t/t0061-run-command.sh | 9 | ||||
| -rwxr-xr-x | t/t9902-completion.sh | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/t/.gitattributes b/t/.gitattributes index e7acedabe1..df05434d32 100644 --- a/t/.gitattributes +++ b/t/.gitattributes @@ -16,6 +16,7 @@ t[0-9][0-9][0-9][0-9]/* -whitespace /t4135/* eol=lf /t4211/* eol=lf /t4252/* eol=lf +/t4256/1/* eol=lf /t5100/* eol=lf /t5515/* eol=lf /t556x_common eol=lf diff --git a/t/t0061-run-command.sh b/t/t0061-run-command.sh index cf932c8514..96bf6d6a7d 100755 --- a/t/t0061-run-command.sh +++ b/t/t0061-run-command.sh @@ -13,11 +13,13 @@ cat >hello-script <<-EOF EOF test_expect_success 'start_command reports ENOENT (slash)' ' - test-tool run-command start-command-ENOENT ./does-not-exist + test-tool run-command start-command-ENOENT ./does-not-exist 2>err && + test_i18ngrep "\./does-not-exist" err ' test_expect_success 'start_command reports ENOENT (no slash)' ' - test-tool run-command start-command-ENOENT does-not-exist + test-tool run-command start-command-ENOENT does-not-exist 2>err && + test_i18ngrep "does-not-exist" err ' test_expect_success 'run_command can run a command' ' @@ -33,7 +35,8 @@ test_expect_success 'run_command is restricted to PATH' ' write_script should-not-run <<-\EOF && echo yikes EOF - test_must_fail test-tool run-command run-command should-not-run + test_must_fail test-tool run-command run-command should-not-run 2>err && + test_i18ngrep "should-not-run" err ' test_expect_success !MINGW 'run_command can run a script without a #! line' ' diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index d01ad8eb25..137fdc9bd5 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -1539,7 +1539,7 @@ test_expect_success 'complete tree filename with metacharacters' ' EOF ' -test_expect_success 'send-email' ' +test_expect_success PERL 'send-email' ' test_completion "git send-email --cov" "--cover-letter " && test_completion "git send-email ma" "master " ' |