From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 4 Mar 2011 23:02:26 +0000 (-0800)
Subject: Merge branch 'jk/fail-null-clone'
X-Git-Tag: v1.7.5-rc0~101
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/51aca1665b9fa8214927780fbccd1915649b3c44?ds=inline;hp=-c

Merge branch 'jk/fail-null-clone'

* jk/fail-null-clone:
clone: die when trying to clone missing local path
---

51aca1665b9fa8214927780fbccd1915649b3c44
diff --combined builtin/clone.c
index 60d9a64280,6fcd699949..2ee1fa9846
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@@ -66,10 -66,10 +66,10 @@@ static struct option builtin_clone_opti
  		    "setup as shared repository"),
  	OPT_BOOLEAN(0, "recursive", &option_recursive,
  		    "initialize submodules in the clone"),
 -	OPT_BOOLEAN(0, "recurse_submodules", &option_recursive,
 +	OPT_BOOLEAN(0, "recurse-submodules", &option_recursive,
  		    "initialize submodules in the clone"),
 -	OPT_STRING(0, "template", &option_template, "path",
 -		   "path the template repository"),
 +	OPT_STRING(0, "template", &option_template, "template-directory",
 +		   "directory from which templates will be used"),
  	OPT_STRING(0, "reference", &option_reference, "repo",
  		   "reference repository"),
  	OPT_STRING('o', "origin", &option_origin, "branch",
@@@ -413,7 -413,7 +413,7 @@@ int cmd_clone(int argc, const char **ar
  	if (path)
  		repo = xstrdup(make_nonrelative_path(repo_name));
  	else if (!strchr(repo_name, ':'))
- 		repo = xstrdup(make_absolute_path(repo_name));
+ 		die("repository '%s' does not exist", repo_name);
  	else
  		repo = repo_name;
  	is_local = path && !is_bundle;