| Message ID | pull.865.v6.git.1614878345754.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v6] builtin/clone.c: add --reject-shallow option | expand |
PING. Seems that this patch have been forgotten by everyone. -------------- >From: lilinchao <lilinchao@oschina.cn> > >In some scenarios, users may want more history than the repository >offered for cloning, which happens to be a shallow repository, can >give them. But because users don't know it is a shallow repository >until they download it to local, users should have the option to >refuse to clone this kind of repository, and may want to exit the >process immediately without creating any unnecessary files. > >Althought there is an option '--depth=x' for users to decide how >deep history they can fetch, but as the unshallow cloning's depth >is INFINITY, we can't know exactly the minimun 'x' value that can >satisfy the minimum integrity, so we can't pass 'x' value to --depth, >and expect this can obtain a complete history of a repository. > >In other scenarios, if we have an API that allow us to import external >repository, and then perform various operations on the repo. >But if the imported is a shallow one(which is actually possible), it >will affect the subsequent operations. So we can choose to refuse to >clone, and let's just import a normal repository. > >This patch offers a new option '--reject-shallow' that can reject to >clone a shallow repository. > >Signed-off-by: lilinchao <lilinchao@oschina.cn> >--- > builtin/clone.c: add --reject-shallow option > > Changes since v1: > > * Rename --no-shallow to --reject-shallow > * Enable to reject a non-local clone > * Enable --[no-]reject-shallow from CLI override configuration. > * Add more testcases. > * Reword commit messages and relative documentation. > > Changes since v3: > > * Add support to reject clone shallow repo over https protocol > * Add testcase to reject clone shallow repo over https:// transport > * Reword commit messages and relative documentation according > suggestions from Junio. > > Changes since v5: > > * camelcase config variable > * warning client that source repo is shallow > * better support ssh:// and git:// protocol v1, v2 > > Signed-off-by: lilinchao lilinchao@oschina.cn > >Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-865%2FCactusinhand%2Fgit-clone-options-v6 >Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-865/Cactusinhand/git-clone-options-v6 >Pull-Request: https://github.com/gitgitgadget/git/pull/865 > >Range-diff vs v5: > > 1: 3f765e49e4a7 ! 1: 953122588ca8 builtin/clone.c: add --reject-shallow option > @@ Documentation/config/clone.txt: clone.defaultRemoteName:: > `origin`, and can be overridden by passing the `--origin` command-line > option to linkgit:git-clone[1]. > + > -+clone.rejectshallow:: > ++clone.rejectShallow:: > + Reject to clone a repository if it is a shallow one, can be overridden by > + passing option `--reject-shallow` in command line. See linkgit:git-clone[1] > > @@ Documentation/git-clone.txt: objects from the source repository into a pack in t > No checkout of HEAD is performed after the clone is complete. > > +--[no-]reject-shallow:: > -+ Fail if the source repository is a shallow repository. The > -+ 'clone.rejectshallow' configuration variable can be used to > ++ Fail if the source repository is a shallow repository. > ++ The 'clone.rejectShallow' configuration variable can be used to > + give the default. > + > --bare:: > @@ builtin/clone.c: static int git_clone_config(const char *k, const char *v, void > free(remote_name); > remote_name = xstrdup(v); > } > -+ if (!strcmp(k, "clone.rejectshallow")) { > ++ if (!strcmp(k, "clone.rejectshallow")) > + config_shallow = git_config_bool(k, v); > -+ } > ++ > return git_default_config(k, v, cb); > } > > @@ builtin/clone.c: int cmd_clone(int argc, const char **argv, const char *prefix) > + * If option_shallow is specified from CLI option, > + * ignore config_shallow from git_clone_config. > + */ > -+ if (config_shallow != -1) { > ++ if (config_shallow != -1) > + reject_shallow = config_shallow; > -+ } > -+ if (option_shallow != -1) { > ++ > ++ if (option_shallow != -1) > + reject_shallow = option_shallow; > -+ } > ++ > /* > * apply the remote name provided by --origin only after this second > * call to git_config, to ensure it overrides all config-based values. > @@ builtin/clone.c: int cmd_clone(int argc, const char **argv, const char *prefix) > if (!access(mkpath("%s/shallow", path), F_OK)) { > + if (reject_shallow) > + die("source repository is shallow, reject to clone."); > ++ else > ++ warning("source repository is shallow."); > if (option_local > 0) > warning(_("source repository is shallow, ignoring --local")); > is_local = 0; > @@ fetch-pack.c: static struct ref *do_fetch_pack(struct fetch_pack_args *args, > > if (args->stateless_rpc) > packet_flush(fd[1]); > -+ > -+ if (!args->deepen && args->remote_shallow) > -+ die("source repository is shallow, reject to clone."); > + > if (args->deepen) > setup_alternate_shallow(&shallow_lock, &alternate_shallow_file, > NULL); > +- else if (si->nr_ours || si->nr_theirs) > ++ else if (si->nr_ours || si->nr_theirs) { > ++ if (args->remote_shallow) > ++ die("source repository is shallow, reject to clone."); > ++ else > ++ warning("source repository is shallow."); > + alternate_shallow_file = setup_temporary_shallow(si->shallow); > +- else > ++ } else > + alternate_shallow_file = NULL; > + if (get_pack(args, fd, pack_lockfiles, NULL, sought, nr_sought, > + &gitmodules_oids)) > @@ fetch-pack.c: static void receive_shallow_info(struct fetch_pack_args *args, > - * shallow. In v0, remote refs that reach these objects are > * rejected (unless --update-shallow is set); do the same. > */ > -+ if (args->remote_shallow) > -+ die("source repository is shallow, reject to clone."); > prepare_shallow_info(si, shallows); > - if (si->nr_ours || si->nr_theirs) > +- if (si->nr_ours || si->nr_theirs) > ++ if (si->nr_ours || si->nr_theirs) { > ++ if (args->remote_shallow) > ++ die("source repository is shallow, reject to clone."); > ++ else > ++ warning("source repository is shallow."); > alternate_shallow_file = > + setup_temporary_shallow(si->shallow); > +- else > ++ } else > + alternate_shallow_file = NULL; > + } else { > + alternate_shallow_file = NULL; > > ## fetch-pack.h ## > @@ fetch-pack.h: struct fetch_pack_args { > @@ t/t5611-clone-config.sh: test_expect_success 'clone -c remote.<remote>.fetch=<re > test_commit attributes .gitattributes "" && > rm -rf child && > > - ## transport-helper.c ## > -@@ transport-helper.c: static const char *boolean_options[] = { > - TRANS_OPT_THIN, > - TRANS_OPT_KEEP, > - TRANS_OPT_FOLLOWTAGS, > -- TRANS_OPT_DEEPEN_RELATIVE > -+ TRANS_OPT_DEEPEN_RELATIVE, > -+ TRANS_OPT_REJECT_SHALLOW > - }; > - > - static int strbuf_set_helper_option(struct helper_data *data, > - > ## transport.c ## > @@ transport.c: static int set_git_option(struct git_transport_options *opts, > list_objects_filter_die_if_populated(&opts->filter_options); > @@ transport.h: void transport_check_allowed(const char *type); > /* Aggressively fetch annotated tags if possible */ > #define TRANS_OPT_FOLLOWTAGS "followtags" > > -+/* reject shallow repo transport */ > ++/* Reject shallow repo transport */ > +#define TRANS_OPT_REJECT_SHALLOW "rejectshallow" > + > /* Accept refs that may update .git/shallow without --depth */ > > > Documentation/config/clone.txt | 4 +++ > Documentation/git-clone.txt | 7 ++++- > builtin/clone.c | 24 +++++++++++++++++ > fetch-pack.c | 17 +++++++++--- > fetch-pack.h | 1 + > t/t5606-clone-options.sh | 47 ++++++++++++++++++++++++++++++++++ > t/t5611-clone-config.sh | 32 +++++++++++++++++++++++ > transport.c | 4 +++ > transport.h | 4 +++ > 9 files changed, 135 insertions(+), 5 deletions(-) > >diff --git a/Documentation/config/clone.txt b/Documentation/config/clone.txt >index 47de36a5fedf..7bcfbd18a52a 100644 >--- a/Documentation/config/clone.txt >+++ b/Documentation/config/clone.txt >@@ -2,3 +2,7 @@ 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, can be overridden by >+ passing option `--reject-shallow` in command line. See linkgit:git-clone[1] >diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt >index 02d9c19cec75..0adc98fa7eee 100644 >--- a/Documentation/git-clone.txt >+++ b/Documentation/git-clone.txt >@@ -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-]reject-shallow] > [--filter=<filter>] [--] <repository> > [<directory>] > >@@ -149,6 +149,11 @@ 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-]reject-shallow:: >+ Fail if the source repository is a shallow repository. >+ The 'clone.rejectShallow' configuration variable can be used to >+ give the default. >+ > --bare:: > Make a 'bare' Git repository. That is, instead of > creating `<directory>` and placing the administrative >diff --git a/builtin/clone.c b/builtin/clone.c >index 51e844a2de0a..5c64837e8f7b 100644 >--- a/builtin/clone.c >+++ b/builtin/clone.c >@@ -50,6 +50,8 @@ 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_shallow = -1; /* unspecified */ >+static int config_shallow = -1; /* unspecified */ > static int deepen; > static char *option_template, *option_depth, *option_since; > static char *option_origin = NULL; >@@ -90,6 +92,8 @@ static struct option builtin_clone_options[] = { > OPT__VERBOSITY(&option_verbosity), > OPT_BOOL(0, "progress", &option_progress, > N_("force progress reporting")), >+ OPT_BOOL(0, "reject-shallow", &option_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 +862,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")) >+ config_shallow = git_config_bool(k, v); >+ > return git_default_config(k, v, cb); > } > >@@ -963,6 +970,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 reject_shallow = 0; > const char *repo_name, *repo, *work_tree, *git_dir; > char *path, *dir, *display_repo = NULL; > int dest_exists, real_dest_exists = 0; >@@ -1156,6 +1164,16 @@ int cmd_clone(int argc, const char **argv, const char *prefix) > */ > git_config(git_clone_config, NULL); > >+ /* >+ * If option_shallow is specified from CLI option, >+ * ignore config_shallow from git_clone_config. >+ */ >+ if (config_shallow != -1) >+ reject_shallow = config_shallow; >+ >+ if (option_shallow != -1) >+ reject_shallow = option_shallow; >+ > /* > * apply the remote name provided by --origin only after this second > * call to git_config, to ensure it overrides all config-based values. >@@ -1216,6 +1234,10 @@ 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)) { >+ if (reject_shallow) >+ die("source repository is shallow, reject to clone."); >+ else >+ warning("source repository is shallow."); > if (option_local > 0) > warning(_("source repository is shallow, ignoring --local")); > is_local = 0; >@@ -1227,6 +1249,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix) > > transport_set_option(transport, TRANS_OPT_KEEP, "yes"); > >+ if (reject_shallow) >+ transport_set_option(transport, TRANS_OPT_REJECT_SHALLOW, "1"); > if (option_depth) > transport_set_option(transport, TRANS_OPT_DEPTH, > option_depth); >diff --git a/fetch-pack.c b/fetch-pack.c >index 0cb59acc4866..860ff45d46e7 100644 >--- a/fetch-pack.c >+++ b/fetch-pack.c >@@ -1126,12 +1126,17 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args, > > if (args->stateless_rpc) > packet_flush(fd[1]); >+ > if (args->deepen) > setup_alternate_shallow(&shallow_lock, &alternate_shallow_file, > NULL); >- else if (si->nr_ours || si->nr_theirs) >+ else if (si->nr_ours || si->nr_theirs) { >+ if (args->remote_shallow) >+ die("source repository is shallow, reject to clone."); >+ else >+ warning("source repository is shallow."); > alternate_shallow_file = setup_temporary_shallow(si->shallow); >- else >+ } else > alternate_shallow_file = NULL; > if (get_pack(args, fd, pack_lockfiles, NULL, sought, nr_sought, > &gitmodules_oids)) >@@ -1498,10 +1503,14 @@ static void receive_shallow_info(struct fetch_pack_args *args, > * rejected (unless --update-shallow is set); do the same. > */ > prepare_shallow_info(si, shallows); >- if (si->nr_ours || si->nr_theirs) >+ if (si->nr_ours || si->nr_theirs) { >+ if (args->remote_shallow) >+ die("source repository is shallow, reject to clone."); >+ else >+ warning("source repository is shallow."); > alternate_shallow_file = > setup_temporary_shallow(si->shallow); >- else >+ } else > alternate_shallow_file = NULL; > } else { > alternate_shallow_file = NULL; >diff --git a/fetch-pack.h b/fetch-pack.h >index 736a3dae467a..6e4f8f0d738c 100644 >--- a/fetch-pack.h >+++ b/fetch-pack.h >@@ -39,6 +39,7 @@ struct fetch_pack_args { > unsigned self_contained_and_connected:1; > unsigned cloning:1; > unsigned update_shallow:1; >+ unsigned remote_shallow:1; > unsigned deepen:1; > > /* >diff --git a/t/t5606-clone-options.sh b/t/t5606-clone-options.sh >index 52e5789fb050..6170d0513227 100755 >--- a/t/t5606-clone-options.sh >+++ b/t/t5606-clone-options.sh >@@ -5,6 +5,8 @@ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main > export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME > > . ./test-lib.sh >+. "$TEST_DIRECTORY"/lib-httpd.sh >+start_httpd > > test_expect_success 'setup' ' > >@@ -45,6 +47,51 @@ test_expect_success 'disallows --bare with --separate-git-dir' ' > > ' > >+test_expect_success 'fail to clone http shallow repository' ' >+ git clone --depth=1 --no-local parent shallow-repo && >+ git clone --bare --no-local shallow-repo "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" && >+ test_must_fail git clone --reject-shallow $HTTPD_URL/smart/repo.git out 2>err && >+ test_i18ngrep -e "source repository is shallow, reject to clone." err >+ >+' >+ >+test_expect_success 'fail to clone shallow repository' ' >+ rm -rf shallow-repo && >+ git clone --depth=1 --no-local parent shallow-repo && >+ test_must_fail git clone --reject-shallow shallow-repo out 2>err && >+ test_i18ngrep -e "source repository is shallow, reject to clone." err >+ >+' >+ >+test_expect_success 'fail to clone non-local shallow repository' ' >+ rm -rf shallow-repo && >+ git clone --depth=1 --no-local parent shallow-repo && >+ test_must_fail git clone --reject-shallow --no-local shallow-repo out 2>err && >+ test_i18ngrep -e "source repository is shallow, reject to clone." err >+ >+' >+ >+test_expect_success 'clone shallow repository with --no-reject-shallow' ' >+ rm -rf shallow-repo && >+ git clone --depth=1 --no-local parent shallow-repo && >+ git clone --no-reject-shallow --no-local shallow-repo clone-repo >+ >+' >+ >+test_expect_success 'clone normal repository with --reject-shallow' ' >+ rm -rf clone-repo && >+ git clone --no-local parent normal-repo && >+ git clone --reject-shallow --no-local normal-repo clone-repo >+ >+' >+ >+test_expect_success 'unspecified any configs or options' ' >+ rm -rf shallow-repo clone-repo && >+ git clone --depth=1 --no-local parent shallow-repo && >+ git clone shallow-repo clone-repo >+ >+' >+ > test_expect_success 'uses "origin" for default remote name' ' > > git clone parent clone-default-origin && >diff --git a/t/t5611-clone-config.sh b/t/t5611-clone-config.sh >index 9f555b87ecdf..da10d3f10352 100755 >--- a/t/t5611-clone-config.sh >+++ b/t/t5611-clone-config.sh >@@ -95,6 +95,38 @@ test_expect_success 'clone -c remote.<remote>.fetch=<refspec> --origin=<name>' ' > test_cmp expect actual > ' > >+test_expect_success 'clone.rejectshallow=true should fail to clone' ' >+ rm -rf child && >+ git clone --depth=1 --no-local . child && >+ test_must_fail git -c clone.rejectshallow=true clone --no-local child out 2>err && >+ test_i18ngrep -e "source repository is shallow, reject to clone." err >+' >+ >+test_expect_success 'clone.rejectshallow=false should succeed' ' >+ rm -rf child out && >+ git clone --depth=1 --no-local . child && >+ git -c clone.rejectshallow=false clone --no-local child out >+' >+ >+test_expect_success 'clone.rejectshallow=true should succeed with normal repo' ' >+ rm -rf child out && >+ git clone --no-local . child && >+ git -c clone.rejectshallow=true clone --no-local child out >+' >+ >+test_expect_success 'option --reject-shallow override clone.rejectshallow' ' >+ rm -rf child out && >+ git clone --depth=1 --no-local . child && >+ test_must_fail git -c clone.rejectshallow=false clone --reject-shallow --no-local child out 2>err && >+ test_i18ngrep -e "source repository is shallow, reject to clone." err >+' >+ >+test_expect_success 'option --no-reject-shallow override clone.rejectshallow' ' >+ rm -rf child out && >+ git clone --depth=1 --no-local . child && >+ git -c clone.rejectshallow=true clone --no-reject-shallow --no-local child out >+' >+ > test_expect_success MINGW 'clone -c core.hideDotFiles' ' > test_commit attributes .gitattributes "" && > rm -rf child && >diff --git a/transport.c b/transport.c >index b13fab5dc3b1..34fe01221ee0 100644 >--- a/transport.c >+++ b/transport.c >@@ -236,6 +236,9 @@ static int set_git_option(struct git_transport_options *opts, > list_objects_filter_die_if_populated(&opts->filter_options); > parse_list_objects_filter(&opts->filter_options, value); > return 0; >+ } else if (!strcmp(name, TRANS_OPT_REJECT_SHALLOW)) { >+ opts->reject_shallow = !!value; >+ return 0; > } > return 1; > } >@@ -370,6 +373,7 @@ static int fetch_refs_via_pack(struct transport *transport, > args.stateless_rpc = transport->stateless_rpc; > args.server_options = transport->server_options; > args.negotiation_tips = data->options.negotiation_tips; >+ args.remote_shallow = transport->smart_options->reject_shallow; > > if (!data->got_remote_heads) { > int i; >diff --git a/transport.h b/transport.h >index 24e15799e714..4d5db0a7f22b 100644 >--- a/transport.h >+++ b/transport.h >@@ -14,6 +14,7 @@ struct git_transport_options { > unsigned check_self_contained_and_connected : 1; > unsigned self_contained_and_connected : 1; > unsigned update_shallow : 1; >+ unsigned reject_shallow : 1; > unsigned deepen_relative : 1; > > /* see documentation of corresponding flag in fetch-pack.h */ >@@ -194,6 +195,9 @@ void transport_check_allowed(const char *type); > /* Aggressively fetch annotated tags if possible */ > #define TRANS_OPT_FOLLOWTAGS "followtags" > >+/* Reject shallow repo transport */ >+#define TRANS_OPT_REJECT_SHALLOW "rejectshallow" >+ > /* Accept refs that may update .git/shallow without --depth */ > #define TRANS_OPT_UPDATE_SHALLOW "updateshallow" > > >base-commit: f01623b2c9d14207e497b21ebc6b3ec4afaf4b46 >-- >gitgitgadget >
diff --git a/Documentation/config/clone.txt b/Documentation/config/clone.txt index 47de36a5fedf..7bcfbd18a52a 100644 --- a/Documentation/config/clone.txt +++ b/Documentation/config/clone.txt @@ -2,3 +2,7 @@ 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, can be overridden by + passing option `--reject-shallow` in command line. See linkgit:git-clone[1] diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index 02d9c19cec75..0adc98fa7eee 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@ -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-]reject-shallow] [--filter=<filter>] [--] <repository> [<directory>] @@ -149,6 +149,11 @@ 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-]reject-shallow:: + Fail if the source repository is a shallow repository. + The 'clone.rejectShallow' configuration variable can be used to + give the default. + --bare:: Make a 'bare' Git repository. That is, instead of creating `<directory>` and placing the administrative diff --git a/builtin/clone.c b/builtin/clone.c index 51e844a2de0a..5c64837e8f7b 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -50,6 +50,8 @@ 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_shallow = -1; /* unspecified */ +static int config_shallow = -1; /* unspecified */ static int deepen; static char *option_template, *option_depth, *option_since; static char *option_origin = NULL; @@ -90,6 +92,8 @@ static struct option builtin_clone_options[] = { OPT__VERBOSITY(&option_verbosity), OPT_BOOL(0, "progress", &option_progress, N_("force progress reporting")), + OPT_BOOL(0, "reject-shallow", &option_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 +862,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")) + config_shallow = git_config_bool(k, v); + return git_default_config(k, v, cb); } @@ -963,6 +970,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 reject_shallow = 0; const char *repo_name, *repo, *work_tree, *git_dir; char *path, *dir, *display_repo = NULL; int dest_exists, real_dest_exists = 0; @@ -1156,6 +1164,16 @@ int cmd_clone(int argc, const char **argv, const char *prefix) */ git_config(git_clone_config, NULL); + /* + * If option_shallow is specified from CLI option, + * ignore config_shallow from git_clone_config. + */ + if (config_shallow != -1) + reject_shallow = config_shallow; + + if (option_shallow != -1) + reject_shallow = option_shallow; + /* * apply the remote name provided by --origin only after this second * call to git_config, to ensure it overrides all config-based values. @@ -1216,6 +1234,10 @@ 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)) { + if (reject_shallow) + die("source repository is shallow, reject to clone."); + else + warning("source repository is shallow."); if (option_local > 0) warning(_("source repository is shallow, ignoring --local")); is_local = 0; @@ -1227,6 +1249,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix) transport_set_option(transport, TRANS_OPT_KEEP, "yes"); + if (reject_shallow) + transport_set_option(transport, TRANS_OPT_REJECT_SHALLOW, "1"); if (option_depth) transport_set_option(transport, TRANS_OPT_DEPTH, option_depth); diff --git a/fetch-pack.c b/fetch-pack.c index 0cb59acc4866..860ff45d46e7 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -1126,12 +1126,17 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args, if (args->stateless_rpc) packet_flush(fd[1]); + if (args->deepen) setup_alternate_shallow(&shallow_lock, &alternate_shallow_file, NULL); - else if (si->nr_ours || si->nr_theirs) + else if (si->nr_ours || si->nr_theirs) { + if (args->remote_shallow) + die("source repository is shallow, reject to clone."); + else + warning("source repository is shallow."); alternate_shallow_file = setup_temporary_shallow(si->shallow); - else + } else alternate_shallow_file = NULL; if (get_pack(args, fd, pack_lockfiles, NULL, sought, nr_sought, &gitmodules_oids)) @@ -1498,10 +1503,14 @@ static void receive_shallow_info(struct fetch_pack_args *args, * rejected (unless --update-shallow is set); do the same. */ prepare_shallow_info(si, shallows); - if (si->nr_ours || si->nr_theirs) + if (si->nr_ours || si->nr_theirs) { + if (args->remote_shallow) + die("source repository is shallow, reject to clone."); + else + warning("source repository is shallow."); alternate_shallow_file = setup_temporary_shallow(si->shallow); - else + } else alternate_shallow_file = NULL; } else { alternate_shallow_file = NULL; diff --git a/fetch-pack.h b/fetch-pack.h index 736a3dae467a..6e4f8f0d738c 100644 --- a/fetch-pack.h +++ b/fetch-pack.h @@ -39,6 +39,7 @@ struct fetch_pack_args { unsigned self_contained_and_connected:1; unsigned cloning:1; unsigned update_shallow:1; + unsigned remote_shallow:1; unsigned deepen:1; /* diff --git a/t/t5606-clone-options.sh b/t/t5606-clone-options.sh index 52e5789fb050..6170d0513227 100755 --- a/t/t5606-clone-options.sh +++ b/t/t5606-clone-options.sh @@ -5,6 +5,8 @@ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh +. "$TEST_DIRECTORY"/lib-httpd.sh +start_httpd test_expect_success 'setup' ' @@ -45,6 +47,51 @@ test_expect_success 'disallows --bare with --separate-git-dir' ' ' +test_expect_success 'fail to clone http shallow repository' ' + git clone --depth=1 --no-local parent shallow-repo && + git clone --bare --no-local shallow-repo "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" && + test_must_fail git clone --reject-shallow $HTTPD_URL/smart/repo.git out 2>err && + test_i18ngrep -e "source repository is shallow, reject to clone." err + +' + +test_expect_success 'fail to clone shallow repository' ' + rm -rf shallow-repo && + git clone --depth=1 --no-local parent shallow-repo && + test_must_fail git clone --reject-shallow shallow-repo out 2>err && + test_i18ngrep -e "source repository is shallow, reject to clone." err + +' + +test_expect_success 'fail to clone non-local shallow repository' ' + rm -rf shallow-repo && + git clone --depth=1 --no-local parent shallow-repo && + test_must_fail git clone --reject-shallow --no-local shallow-repo out 2>err && + test_i18ngrep -e "source repository is shallow, reject to clone." err + +' + +test_expect_success 'clone shallow repository with --no-reject-shallow' ' + rm -rf shallow-repo && + git clone --depth=1 --no-local parent shallow-repo && + git clone --no-reject-shallow --no-local shallow-repo clone-repo + +' + +test_expect_success 'clone normal repository with --reject-shallow' ' + rm -rf clone-repo && + git clone --no-local parent normal-repo && + git clone --reject-shallow --no-local normal-repo clone-repo + +' + +test_expect_success 'unspecified any configs or options' ' + rm -rf shallow-repo clone-repo && + git clone --depth=1 --no-local parent shallow-repo && + git clone shallow-repo clone-repo + +' + test_expect_success 'uses "origin" for default remote name' ' git clone parent clone-default-origin && diff --git a/t/t5611-clone-config.sh b/t/t5611-clone-config.sh index 9f555b87ecdf..da10d3f10352 100755 --- a/t/t5611-clone-config.sh +++ b/t/t5611-clone-config.sh @@ -95,6 +95,38 @@ test_expect_success 'clone -c remote.<remote>.fetch=<refspec> --origin=<name>' ' test_cmp expect actual ' +test_expect_success 'clone.rejectshallow=true should fail to clone' ' + rm -rf child && + git clone --depth=1 --no-local . child && + test_must_fail git -c clone.rejectshallow=true clone --no-local child out 2>err && + test_i18ngrep -e "source repository is shallow, reject to clone." err +' + +test_expect_success 'clone.rejectshallow=false should succeed' ' + rm -rf child out && + git clone --depth=1 --no-local . child && + git -c clone.rejectshallow=false clone --no-local child out +' + +test_expect_success 'clone.rejectshallow=true should succeed with normal repo' ' + rm -rf child out && + git clone --no-local . child && + git -c clone.rejectshallow=true clone --no-local child out +' + +test_expect_success 'option --reject-shallow override clone.rejectshallow' ' + rm -rf child out && + git clone --depth=1 --no-local . child && + test_must_fail git -c clone.rejectshallow=false clone --reject-shallow --no-local child out 2>err && + test_i18ngrep -e "source repository is shallow, reject to clone." err +' + +test_expect_success 'option --no-reject-shallow override clone.rejectshallow' ' + rm -rf child out && + git clone --depth=1 --no-local . child && + git -c clone.rejectshallow=true clone --no-reject-shallow --no-local child out +' + test_expect_success MINGW 'clone -c core.hideDotFiles' ' test_commit attributes .gitattributes "" && rm -rf child && diff --git a/transport.c b/transport.c index b13fab5dc3b1..34fe01221ee0 100644 --- a/transport.c +++ b/transport.c @@ -236,6 +236,9 @@ static int set_git_option(struct git_transport_options *opts, list_objects_filter_die_if_populated(&opts->filter_options); parse_list_objects_filter(&opts->filter_options, value); return 0; + } else if (!strcmp(name, TRANS_OPT_REJECT_SHALLOW)) { + opts->reject_shallow = !!value; + return 0; } return 1; } @@ -370,6 +373,7 @@ static int fetch_refs_via_pack(struct transport *transport, args.stateless_rpc = transport->stateless_rpc; args.server_options = transport->server_options; args.negotiation_tips = data->options.negotiation_tips; + args.remote_shallow = transport->smart_options->reject_shallow; if (!data->got_remote_heads) { int i; diff --git a/transport.h b/transport.h index 24e15799e714..4d5db0a7f22b 100644 --- a/transport.h +++ b/transport.h @@ -14,6 +14,7 @@ struct git_transport_options { unsigned check_self_contained_and_connected : 1; unsigned self_contained_and_connected : 1; unsigned update_shallow : 1; + unsigned reject_shallow : 1; unsigned deepen_relative : 1; /* see documentation of corresponding flag in fetch-pack.h */ @@ -194,6 +195,9 @@ void transport_check_allowed(const char *type); /* Aggressively fetch annotated tags if possible */ #define TRANS_OPT_FOLLOWTAGS "followtags" +/* Reject shallow repo transport */ +#define TRANS_OPT_REJECT_SHALLOW "rejectshallow" + /* Accept refs that may update .git/shallow without --depth */ #define TRANS_OPT_UPDATE_SHALLOW "updateshallow"