diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-04 16:34:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-04 16:34:02 -0800 |
| commit | 1b52ac5935c3773596fa41f6cf83578ab86b6b83 (patch) | |
| tree | 8cca157ac006bf268b3d9dae8b63fb0f1e073c77 /builtin-ls-remote.c | |
| parent | 3bb18e58fc4f5eddd97bc34fc11dc207b47cc093 (diff) | |
| parent | 0a565de4a50032339d3786d366e70912a4dcf572 (diff) | |
Merge branch 'maint'
* maint:
Fix documentation grammar typo
Allow curl helper to work without a local repository
Require a struct remote in transport_get()
Diffstat (limited to 'builtin-ls-remote.c')
| -rw-r--r-- | builtin-ls-remote.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-ls-remote.c b/builtin-ls-remote.c index 78a88f7476..b5bad0c184 100644 --- a/builtin-ls-remote.c +++ b/builtin-ls-remote.c @@ -86,10 +86,10 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix) pattern[j - i] = p; } } - remote = nongit ? NULL : remote_get(dest); - if (remote && !remote->url_nr) + remote = remote_get(dest); + if (!remote->url_nr) die("remote %s has no configured URL", dest); - transport = transport_get(remote, remote ? remote->url[0] : dest); + transport = transport_get(remote, remote->url[0]); if (uploadpack != NULL) transport_set_option(transport, TRANS_OPT_UPLOADPACK, uploadpack); |