run-command: report exec failure
In 321fd823 ("run-command: mark path lookup errors with ENOENT", 2018-10-24), we rewrote the logic to execute a command by looking in the directories on $PATH; as a side effect, a request to run a command that is not found on $PATH is noticed even before a child process is forked to execute it. We however stopped to report an exec failure in such a case by mistake. Add a logic to report the error unless silent-exec-failure is requested, to match the original code. Reported-by: John Passaro <john.a.passaro@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Dec 11, 2018 at 14:46 UTC
e5a329a279c7ecb5214ccc049ca659aa3ad733cf
2 files changed
+8
-3
run-command.c
+2
@@ -728,6 +728,8 @@ fail_pipe:
728
if (prepare_cmd(&argv, cmd) < 0) {
729
failed_errno = errno;
730
cmd->pid = -1;
731
+ if (!cmd->silent_exec_failure)
732
+ error_errno("cannot run %s", cmd->argv[0]);
733
goto end_of_spawn;
734
}
735
t/t0061-run-command.sh
+6
-3
@@ -14,11 +14,13 @@ EOF
14
>empty
15
16
test_expect_success 'start_command reports ENOENT (slash)' '
17
- test-tool run-command start-command-ENOENT ./does-not-exist
17
+ test-tool run-command start-command-ENOENT ./does-not-exist 2>err &&
18
+ test_i18ngrep "\./does-not-exist" err
19
'
20
21
test_expect_success 'start_command reports ENOENT (no slash)' '
21
- test-tool run-command start-command-ENOENT does-not-exist
22
+ test-tool run-command start-command-ENOENT does-not-exist 2>err &&
23
+ test_i18ngrep "does-not-exist" err
24
'
25
26
test_expect_success 'run_command can run a command' '
@@ -34,7 +36,8 @@ test_expect_success 'run_command is restricted to PATH' '
36
write_script should-not-run <<-\EOF &&
37
echo yikes
38
EOF
37
- test_must_fail test-tool run-command run-command should-not-run
39
+ test_must_fail test-tool run-command run-command should-not-run 2>err &&
40
+ test_i18ngrep "should-not-run" err
41
'
42
43
test_expect_success !MINGW 'run_command can run a script without a #! line' '