summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-09-03 19:37:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-09-03 19:37:03 (GMT)
commit18aff08e04502c565e9a0538df12d04f2ca8765c (patch)
treeaaaf8579aacde4c18d5a4c224f28d044dc20a81d /builtin
parentafd49c39dd0089ab887f77be0a8a5a2fc5054cfa (diff)
parentc0e190c168becfd7d6c27cd868542295bd474742 (diff)
downloadgit-18aff08e04502c565e9a0538df12d04f2ca8765c.zip
git-18aff08e04502c565e9a0538df12d04f2ca8765c.tar.gz
git-18aff08e04502c565e9a0538df12d04f2ca8765c.tar.bz2
Merge branch 'jc/undash-in-tree-git-callers'
A handful of places in in-tree code still relied on being able to execute the git subcommands, especially built-ins, in "git-foo" form, which have been corrected. * jc/undash-in-tree-git-callers: credential-cache: use child_process.args cvsexportcommit: do not run git programs in dashed form transport-helper: do not run git-remote-ext etc. in dashed form
Diffstat (limited to 'builtin')
-rw-r--r--builtin/credential-cache.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/credential-cache.c b/builtin/credential-cache.c
index d0fafde..9b3f709 100644
--- a/builtin/credential-cache.c
+++ b/builtin/credential-cache.c
@@ -42,13 +42,13 @@ static int send_request(const char *socket, const struct strbuf *out)
static void spawn_daemon(const char *socket)
{
struct child_process daemon = CHILD_PROCESS_INIT;
- const char *argv[] = { NULL, NULL, NULL };
char buf[128];
int r;
- argv[0] = "git-credential-cache--daemon";
- argv[1] = socket;
- daemon.argv = argv;
+ strvec_pushl(&daemon.args,
+ "credential-cache--daemon", socket,
+ NULL);
+ daemon.git_cmd = 1;
daemon.no_stdin = 1;
daemon.out = -1;