summary refs log tree commit
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-12-15 12:24:34 +0900
committerJunio C Hamano <gitster@pobox.com>2018-12-15 12:24:34 +0900
commit83243020c8537d48bdaf5d6d43c4be36ad47c8b0 (patch)
tree472f9f546c271b2ee3c2803aa1c935b2c0631d88
parent916f56d38bc86cf8bed0698afde5051c05e7cc68 (diff)
parente5a329a279c7ecb5214ccc049ca659aa3ad733cf (diff)
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
-rw-r--r--run-command.c2
-rwxr-xr-xt/t0061-run-command.sh9
2 files changed, 8 insertions, 3 deletions
diff --git a/run-command.c b/run-command.c
index c11ff80674..3db26b7b0e 100644
--- a/run-command.c
+++ b/run-command.c
@@ -728,6 +728,8 @@ fail_pipe:
         if (prepare_cmd(&argv, cmd) < 0) {
                 failed_errno = errno;
                 cmd->pid = -1;
+                if (!cmd->silent_exec_failure)
+                        error_errno("cannot run %s", cmd->argv[0]);
                 goto end_of_spawn;
         }
 
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' '