summaryrefslogtreecommitdiff
path: root/ssh-fetch.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-28 13:25:20 -0700
committerJunio C Hamano <junkio@cox.net>2006-07-28 13:25:20 -0700
commitfff8fd5b1ee9c13694c29ba3544f5b1ebf0f4fb2 (patch)
treebeb72a990a86ad34c230e7f81d5091aed344d2d7 /ssh-fetch.c
parent556032566e96580e0ea0063a9aead0b380f9c8f7 (diff)
parent8e29f6a07e321a24f1d4f579817f5a8a43cdac05 (diff)
downloadgit-fff8fd5b1ee9c13694c29ba3544f5b1ebf0f4fb2.tar.gz
Merge branch 'pb/multi-fetch'
* pb/multi-fetch: Teach git-http-fetch the --stdin switch Teach git-local-fetch the --stdin switch Make pull() support fetching multiple targets at once Make pull() take some implicit data as explicit arguments
Diffstat (limited to 'ssh-fetch.c')
-rw-r--r--ssh-fetch.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-fetch.c b/ssh-fetch.c
index a8a6cfbb30..6e16568f88 100644
--- a/ssh-fetch.c
+++ b/ssh-fetch.c
@@ -123,6 +123,7 @@ static const char ssh_fetch_usage[] =
" [-c] [-t] [-a] [-v] [--recover] [-w ref] commit-id url";
int main(int argc, char **argv)
{
+ const char *write_ref = NULL;
char *commit_id;
char *url;
int arg = 1;
@@ -159,7 +160,6 @@ int main(int argc, char **argv)
}
commit_id = argv[arg];
url = argv[arg + 1];
- write_ref_log_details = url;
if (setup_connection(&fd_in, &fd_out, prog, url, arg, argv + 1))
return 1;
@@ -167,7 +167,7 @@ int main(int argc, char **argv)
if (get_version())
return 1;
- if (pull(commit_id))
+ if (pull(1, &commit_id, &write_ref, url))
return 1;
return 0;