diff options
author | Junio C Hamano <junkio@cox.net> | 2006-07-29 01:54:54 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-07-29 01:54:54 -0700 |
commit | 7061cf0f205e86613c3a3306fdfedf2a5dcc8a65 (patch) | |
tree | e0595e44fc820032fd5ee942a031439f2e6da3b1 /ssh-fetch.c | |
parent | ac64a722072bb348476a8a029de9a82073e07fba (diff) | |
parent | a633fca0c056aa221d23493c276d3713191621b3 (diff) | |
download | git-7061cf0f205e86613c3a3306fdfedf2a5dcc8a65.tar.gz git-7061cf0f205e86613c3a3306fdfedf2a5dcc8a65.tar.xz |
Merge branch 'lt/setup' into __/setup-n-mv
This merges the new built-in calling convention code into Johannes's
builtin-mv topic in order to resolve their conflicts early on.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'ssh-fetch.c')
-rw-r--r-- | ssh-fetch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh-fetch.c b/ssh-fetch.c index 28f7fd917..6e16568f8 100644 --- a/ssh-fetch.c +++ b/ssh-fetch.c @@ -120,9 +120,10 @@ int fetch_ref(char *ref, unsigned char *sha1) static const char ssh_fetch_usage[] = MY_PROGRAM_NAME - " [-c] [-t] [-a] [-v] [-d] [--recover] [-w ref] commit-id url"; + " [-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; |