X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fls-remote.c;h=8ee91eb547c2bafedd573045c977cc7d0469c95f;hb=a9f80f3dd4dc68ec6e9898805ccac2bb44c563ab;hp=70f5622d9d49aae4080b38ee4487cc6e403a9d2c;hpb=3b0c19663e7976cd32188b42e762c980d1bb93d4;p=git.git

diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c
index 70f5622d9..8ee91eb54 100644
--- a/builtin/ls-remote.c
+++ b/builtin/ls-remote.c
@@ -4,7 +4,8 @@
 #include "remote.h"
 
 static const char ls_remote_usage[] =
-"git ls-remote [--heads] [--tags]  [-u <exec> | --upload-pack <exec>] <repository> <refs>...";
+"git ls-remote [--heads] [--tags]  [-u <exec> | --upload-pack <exec>]\n"
+"                     [<repository> [<refs>...]]";
 
 /*
  * Is there one among the list of patterns that match the tail part
@@ -73,9 +74,6 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
 		break;
 	}
 
-	if (!dest)
-		usage(ls_remote_usage);
-
 	if (argv[i]) {
 		int j;
 		pattern = xcalloc(sizeof(const char *), argc - i + 1);
@@ -87,6 +85,11 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
 		}
 	}
 	remote = remote_get(dest);
+	if (!remote) {
+		if (dest)
+			die("bad repository '%s'", dest);
+		die("No remote configured to list refs from.");
+	}
 	if (!remote->url_nr)
 		die("remote %s has no configured URL", dest);
 	transport = transport_get(remote, NULL);