Merge branch 'nd/clone-depth-zero'

* nd/clone-depth-zero:
  clone: warn users --depth is ignored in local clones
This commit is contained in:
Junio C Hamano 2010-09-03 09:43:45 -07:00
Родитель f9c8e7c8f1 24c61c44e6
Коммит c6babe5762
1 изменённых файлов: 5 добавлений и 2 удалений

Просмотреть файл

@ -361,7 +361,7 @@ static void write_remote_refs(const struct ref *local_refs)
int cmd_clone(int argc, const char **argv, const char *prefix)
{
int is_bundle = 0;
int is_bundle = 0, is_local;
struct stat buf;
const char *repo_name, *repo, *work_tree, *git_dir;
char *path, *dir;
@ -414,6 +414,9 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
repo = xstrdup(make_absolute_path(repo_name));
else
repo = repo_name;
is_local = path && !is_bundle;
if (is_local && option_depth)
warning("--depth is ignored in local clones; use file:// instead.");
if (argc == 2)
dir = xstrdup(argv[1]);
@ -514,7 +517,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
strbuf_reset(&value);
if (path && !is_bundle) {
if (is_local) {
refs = clone_local(path, git_dir);
mapped_refs = wanted_peer_refs(refs, refspec);
} else {