merge(3p/git): Merge git upstream at v2.26.2
This commit is contained in:
commit
5229c9b232
1006 changed files with 149006 additions and 60819 deletions
6
third_party/git/run-command.c
vendored
6
third_party/git/run-command.c
vendored
|
|
@ -213,8 +213,9 @@ 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 r != NULL;
|
||||
return found;
|
||||
}
|
||||
|
||||
int sane_execvp(const char *file, char * const argv[])
|
||||
|
|
@ -412,8 +413,7 @@ static int prepare_cmd(struct argv_array *out, const struct child_process *cmd)
|
|||
argv_array_push(out, SHELL_PATH);
|
||||
|
||||
if (cmd->git_cmd) {
|
||||
argv_array_push(out, "git");
|
||||
argv_array_pushv(out, cmd->argv);
|
||||
prepare_git_cmd(out, cmd->argv);
|
||||
} else if (cmd->use_shell) {
|
||||
prepare_shell_cmd(out, cmd->argv);
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue