@@ -2,3 +2,6 @@ clone.defaultRemoteName::
The name of the remote to create when cloning a repository. Defaults to
`origin`, and can be overridden by passing the `--origin` command-line
option to linkgit:git-clone[1].
+
+clone.rejectshallow::
+ Reject to clone a repository if it is a shallow one.
@@ -15,7 +15,7 @@ SYNOPSIS
[--dissociate] [--separate-git-dir <git dir>]
[--depth <depth>] [--[no-]single-branch] [--no-tags]
[--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]
- [--[no-]remote-submodules] [--jobs <n>] [--sparse]
+ [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--no-shallow]
[--filter=<filter>] [--] <repository>
[<directory>]
@@ -149,6 +149,12 @@ objects from the source repository into a pack in the cloned repository.
--no-checkout::
No checkout of HEAD is performed after the clone is complete.
+--no-shallow::
+ Don't clone a shallow source repository. In some scenariors, clients
+ want the cloned repository information to be complete. Otherwise,
+ the cloning process should end immediately without creating any files,
+ which can save some disk space.
+
--bare::
Make a 'bare' Git repository. That is, instead of
creating `<directory>` and placing the administrative
old mode 100644
new mode 100755
@@ -50,6 +50,7 @@ static int option_no_checkout, option_bare, option_mirror, option_single_branch
static int option_local = -1, option_no_hardlinks, option_shared;
static int option_no_tags;
static int option_shallow_submodules;
+static int option_no_shallow;
static int deepen;
static char *option_template, *option_depth, *option_since;
static char *option_origin = NULL;
@@ -90,6 +91,7 @@ static struct option builtin_clone_options[] = {
OPT__VERBOSITY(&option_verbosity),
OPT_BOOL(0, "progress", &option_progress,
N_("force progress reporting")),
+ OPT_BOOL(0, "no-shallow", &option_no_shallow, N_("don't clone shallow repository")),
OPT_BOOL('n', "no-checkout", &option_no_checkout,
N_("don't create a checkout")),
OPT_BOOL(0, "bare", &option_bare, N_("create a bare repository")),
@@ -858,6 +860,9 @@ static int git_clone_config(const char *k, const char *v, void *cb)
free(remote_name);
remote_name = xstrdup(v);
}
+ if (!strcmp(k, "clone.rejectshallow")) {
+ option_no_shallow = 1;
+ }
return git_default_config(k, v, cb);
}
@@ -963,6 +968,7 @@ static int path_exists(const char *path)
int cmd_clone(int argc, const char **argv, const char *prefix)
{
int is_bundle = 0, is_local;
+ int is_shallow = 0;
const char *repo_name, *repo, *work_tree, *git_dir;
char *path, *dir, *display_repo = NULL;
int dest_exists, real_dest_exists = 0;
@@ -1215,6 +1221,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
if (filter_options.choice)
warning(_("--filter is ignored in local clones; use file:// instead."));
if (!access(mkpath("%s/shallow", path), F_OK)) {
+ is_shallow = 1;
if (option_local > 0)
warning(_("source repository is shallow, ignoring --local"));
is_local = 0;
@@ -1222,6 +1229,12 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
}
if (option_local > 0 && !is_local)
warning(_("--local is ignored"));
+
+ if (is_shallow) {
+ if (option_no_shallow)
+ die(_("source repository is shallow, reject to clone."));
+ }
+
transport->cloning = 1;
transport_set_option(transport, TRANS_OPT_KEEP, "yes");
@@ -45,6 +45,13 @@ test_expect_success 'disallows --bare with --separate-git-dir' '
'
+test_expect_success 'reject clone shallow repository' '
+ git clone --depth=1 --no-local parent shallow-repo &&
+ test_must_fail git clone --no-shallow shallow-repo out 2>err &&
+ test_i18ngrep -e "source repository is shallow, reject to clone." err
+
+'
+
test_expect_success 'uses "origin" for default remote name' '
git clone parent clone-default-origin &&
@@ -95,6 +95,13 @@ test_expect_success 'clone -c remote.<remote>.fetch=<refspec> --origin=<name>' '
test_cmp expect actual
'
+test_expect_success 'clone -c clone.rejectshallow' '
+ rm -rf child &&
+ git clone --depth=1 --no-local . child &&
+ test_must_fail git clone -c clone.rejectshallow child out 2>err &&
+ test_i18ngrep -e "source repository is shallow, reject to clone." err
+'
+
test_expect_success MINGW 'clone -c core.hideDotFiles' '
test_commit attributes .gitattributes "" &&
rm -rf child &&