From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 067301F8C2 for ; Mon, 8 Feb 2021 08:40:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230018AbhBHId2 (ORCPT ); Mon, 8 Feb 2021 03:33:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230213AbhBHIdC (ORCPT ); Mon, 8 Feb 2021 03:33:02 -0500 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BF61C06178A for ; Mon, 8 Feb 2021 00:32:04 -0800 (PST) Received: by mail-wm1-x336.google.com with SMTP id o24so4757462wmh.5 for ; Mon, 08 Feb 2021 00:32:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=XkuusBASsCLiml1cMBP5W7T3dF4jrHPcaAV6q3QTCWQ=; b=ImNJ5OicAOzm3RYLmC7oMS7IACXdQfBR0na755zGfY7j20+NezPIMZ2oKNkKKg6MZk g2TFfk6bLNWhYXZkk42ETVRAmI/u1hv6PAqnIm6zgtaDZDdmINpR6i1dFs5iZY3syhID ixCcI0SO7qHJmFRG49ANPBLq7NNAYWLgbX8CwVKwwjTbvolK9H6woZeywBHGhDbdH27u t8EfXN+1VR3YbJfRxxPr4hFD2UCBhhkRF0w5pTPMX0lLbHbbBcsvGcoSPX37H/2ggzd4 SJVAxblMqqPAUTN7fHxaw3hzQuNFvtiB2aRp1NB8gYSaVQ/dv8Mi+vreJ7omePWIlHGv la5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=XkuusBASsCLiml1cMBP5W7T3dF4jrHPcaAV6q3QTCWQ=; b=H/omoxvEk6KG7nrumjh4iRge8snppN/yTDtji8d41aJSP65yVDdslicBrODoSUWuMW v2tPV4MYipC4d3Xjlcop7BsMTOJlqFDiPbkXFUiNKBLCV4uuAkZ7d74GzvMZ5HjJrwST IfNGHWKjiFgHRTMQz1hbUUfhTYQccLo2O2rhtr9UTG6lb9yZkDW7yMxsrRSg4f45meWE WqBg725VtUR/RRI6BPulAdVmBVvN7jLpvJZxzdh3Bo5sLqu3GsBxTek+cElDmiAbt7pN K3oo91aK0GBjmH1iG1OwRQucy2kDlcIpxRHjcH4Blqs+Z1WBzosLAJPrsVyM4PvRsHC1 p4Dg== X-Gm-Message-State: AOAM531UKWhtDUKQBA8FePKOMWj3xWUSUG+q+UnonPI7oGYSHuOFsjBf xYzDSVtidL+b3vf2/y4sY8AiG0kYR0I= X-Google-Smtp-Source: ABdhPJxfjlHcQc8mD4YwCraBCU+dLH5k4NOD/Xcn/nxGt9dZSWUab/2wJOww4kV67vjBaQLw0bxp1g== X-Received: by 2002:a1c:b684:: with SMTP id g126mr13393702wmf.94.1612773123094; Mon, 08 Feb 2021 00:32:03 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id l1sm17440530wmq.17.2021.02.08.00.32.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 00:32:02 -0800 (PST) Message-Id: <2f9602495eb5455351b926a2dcbf5a5650002382.1612773119.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "lilinchao via GitGitGadget" Date: Mon, 08 Feb 2021 08:31:58 +0000 Subject: [PATCH v2 1/2] builtin/clone.c: add --no-shallow option Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Derrick Stolee , dscho , Li Linchao , lilinchao Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: lilinchao This patch add a new option that reject to clone a shallow repository. Clients don't know it's a shallow repository until they download it locally, in some scenariors, clients just don't want to clone this kind of repository, and want to exit the process immediately without creating any unnecessary files. Signed-off-by: lilinchao --- Documentation/config/clone.txt | 3 +++ Documentation/git-clone.txt | 8 +++++++- builtin/clone.c | 13 +++++++++++++ t/t5606-clone-options.sh | 7 +++++++ t/t5611-clone-config.sh | 7 +++++++ 5 files changed, 37 insertions(+), 1 deletion(-) mode change 100644 => 100755 builtin/clone.c diff --git a/Documentation/config/clone.txt b/Documentation/config/clone.txt index 47de36a5fedf..29b779b8a825 100644 --- a/Documentation/config/clone.txt +++ b/Documentation/config/clone.txt @@ -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. diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index 02d9c19cec75..9ce6e545577f 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@ -15,7 +15,7 @@ SYNOPSIS [--dissociate] [--separate-git-dir ] [--depth ] [--[no-]single-branch] [--no-tags] [--recurse-submodules[=]] [--[no-]shallow-submodules] - [--[no-]remote-submodules] [--jobs ] [--sparse] + [--[no-]remote-submodules] [--jobs ] [--sparse] [--no-shallow] [--filter=] [--] [] @@ -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 `` and placing the administrative diff --git a/builtin/clone.c b/builtin/clone.c old mode 100644 new mode 100755 index e335734b4cfd..b07d867e6641 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -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"); diff --git a/t/t5606-clone-options.sh b/t/t5606-clone-options.sh index 5d6e63a841f7..e9b2bde8be8e 100755 --- a/t/t5606-clone-options.sh +++ b/t/t5606-clone-options.sh @@ -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 && diff --git a/t/t5611-clone-config.sh b/t/t5611-clone-config.sh index 9f555b87ecdf..68fdf5b7ce1b 100755 --- a/t/t5611-clone-config.sh +++ b/t/t5611-clone-config.sh @@ -95,6 +95,13 @@ test_expect_success 'clone -c remote..fetch= --origin=' ' 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 && -- gitgitgadget