diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
| commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
| tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/run-command.c | |
| parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) | |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/run-command.c')
| -rw-r--r-- | third_party/git/run-command.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/third_party/git/run-command.c b/third_party/git/run-command.c index f5e1149f9b..3449db319b 100644 --- a/third_party/git/run-command.c +++ b/third_party/git/run-command.c @@ -213,9 +213,8 @@ static char *locate_in_PATH(const char *file) static int exists_in_PATH(const char *file) { char *r = locate_in_PATH(file); - int found = r != NULL; free(r); - return found; + return r != NULL; } int sane_execvp(const char *file, char * const argv[]) @@ -413,7 +412,8 @@ static int prepare_cmd(struct argv_array *out, const struct child_process *cmd) argv_array_push(out, SHELL_PATH); if (cmd->git_cmd) { - prepare_git_cmd(out, cmd->argv); + argv_array_push(out, "git"); + argv_array_pushv(out, cmd->argv); } else if (cmd->use_shell) { prepare_shell_cmd(out, cmd->argv); } else { |