diff options
author | Junio C Hamano <junkio@cox.net> | 2007-03-18 22:21:06 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-03-18 22:21:06 -0700 |
commit | 3635a187704ed30b32eb11f5098496e5e435a19d (patch) | |
tree | 90fbf761702cc522b5efd2fe69d02b4c797783e9 /builtin-push.c | |
parent | abec100c3382f7d7b759f915a86e9773277263b6 (diff) | |
parent | 38b1c6626b4690a745e23be9aa9ada98c1a55f41 (diff) | |
download | git-3635a187704ed30b32eb11f5098496e5e435a19d.tar.gz |
Merge branch 'sp/run-command'
* sp/run-command:
Use run_command within send-pack
Use run_command within receive-pack to invoke index-pack
Use run_command within merge-index
Use run_command for proxy connections
Use RUN_GIT_CMD to run push backends
Correct new compiler warnings in builtin-revert
Replace fork_with_pipe in bundle with run_command
Teach run-command to redirect stdout to /dev/null
Teach run-command about stdout redirection
Diffstat (limited to 'builtin-push.c')
-rw-r--r-- | builtin-push.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-push.c b/builtin-push.c index 6ab9a28e8c..70b1168fa6 100644 --- a/builtin-push.c +++ b/builtin-push.c @@ -323,10 +323,10 @@ static int do_push(const char *repo) int dest_refspec_nr = refspec_nr; const char **dest_refspec = refspec; const char *dest = uri[i]; - const char *sender = "git-send-pack"; + const char *sender = "send-pack"; if (!prefixcmp(dest, "http://") || !prefixcmp(dest, "https://")) - sender = "git-http-push"; + sender = "http-push"; else if (thin) argv[dest_argc++] = "--thin"; argv[0] = sender; @@ -336,7 +336,7 @@ static int do_push(const char *repo) argv[dest_argc] = NULL; if (verbose) fprintf(stderr, "Pushing to %s\n", dest); - err = run_command_v_opt(argv, 0); + err = run_command_v_opt(argv, RUN_GIT_CMD); if (!err) continue; switch (err) { |