mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/run-command-report-exec-failure-fix' into maint

Browse Source 
A recent update accidentally squelched an error message when the
run_command API failed to run a missing command, which has been
corrected.

* jc/run-command-report-exec-failure-fix:
  run-command: report exec failure
This commit is contained in:
Junio C Hamano
2018-12-15 12:24:34 +09:00
parent 916f56d38b e5a329a279
commit 83243020c8
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
run-command.c
View File

@ -728,6 +728,8 @@ fail_pipe:
if (prepare_cmd(&argv, cmd) < 0) { if (prepare_cmd(&argv, cmd) < 0) {
failed_errno = errno; failed_errno = errno;
cmd->pid = -1; cmd->pid = -1;
if (!cmd->silent_exec_failure)
error_errno("cannot run %s", cmd->argv[0]);
goto end_of_spawn; goto end_of_spawn;
} }

9
t/t0061-run-command.sh
View File

@ -13,11 +13,13 @@ cat >hello-script <<-EOF
EOF EOF
test_expect_success 'start_command reports ENOENT (slash)' ' 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_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' ' 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 && write_script should-not-run <<-\EOF &&
echo yikes echo yikes
EOF 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' ' test_expect_success !MINGW 'run_command can run a script without a #! line' '