From patchwork Thu Mar 31 09:17:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shaoxuan Yuan X-Patchwork-Id: 12796913 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7DA6DC433EF for ; Thu, 31 Mar 2022 09:20:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233299AbiCaJWJ (ORCPT ); Thu, 31 Mar 2022 05:22:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233761AbiCaJWG (ORCPT ); Thu, 31 Mar 2022 05:22:06 -0400 Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBF87139AEB for ; Thu, 31 Mar 2022 02:20:19 -0700 (PDT) Received: by mail-pl1-x634.google.com with SMTP id y6so20304607plg.2 for ; Thu, 31 Mar 2022 02:20:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xP6C+sGbg8Dc3rgp+9z2VVOK/GX4PRLPMazgX+zPKlY=; b=O5SdTMgdA8/tflP3iqLK0gBzBldlGRnA4DhnnXDG++ZpbkxPR+V3jR5HXeqDuGF/ys GeYGEq9rEiyBbpolNjNPHjRlTakwMojmc/L+TbdsowWkCSAfV5nSRcsdjYu3DqG+IzM9 FZaHfCM6zfujFNCnr7eZN+DKpZCg9HnUKubmayBA1aKk8sz/w5cuzIXDfq6JWo0MhlA6 KSKUBWAHR2AtXTgmTknZNxGpJiii3YNYlgf6sCVk0+KAf2IxoPoGQG5txrzJcEQDjSww eqyMk36zYPaPnqYmLQ1icsjfiztuFeIY8yMpVhlHGK0S2orshQMyXqP59yV8wt3ljX4y iKaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xP6C+sGbg8Dc3rgp+9z2VVOK/GX4PRLPMazgX+zPKlY=; b=IpuTKYtELB6F5cusbcZG2Qy3e4zhdAxzQxGHx+QZUp1Q9GphNrDJB1he8zrONqBvB4 Xp6V76ux7apblUvb6EXC2n1UjP/vJMgqgM7Tnuf/kdi74oyL4OOeGBa3Oxv/88xHz36X zGMh2YOr7swIajG6cOH5lQp/SVtf0J2Q0uY9EntVpxzzXj3DQgkXmIh5ylmjBHHiYsjh QNXd1Esu6fD9d/1sEjCBIpz3n8oRQzm8p3gHv92MGHJ8Eq4Smc8rdwY/KtB0DoQYwz3b +K3Un2thl8MXWvm4ndpNYQjduLn96ncVB+OqtFUqWaM+zGjWHt8KYmxYc0t0CnDrSQQM OuOA== X-Gm-Message-State: AOAM533I90aInegs6VUciwd9KMPFA2KhvuPFj9Uapxvlpn5G5kIa+K2J NJVbmaq0YBh6fSecwgoPOXRVAu2x8hQ= X-Google-Smtp-Source: ABdhPJxYoPqt8dpGfWrUY92cYLTOtgCEx+/2GJqnxzD8FkZ8RPzaVwoqghpDi6vN1nbOvD1TrMCp6g== X-Received: by 2002:a17:902:a981:b0:156:229d:6834 with SMTP id bh1-20020a170902a98100b00156229d6834mr14853826plb.128.1648718419101; Thu, 31 Mar 2022 02:20:19 -0700 (PDT) Received: from ffyuanda.localdomain ([119.131.153.75]) by smtp.gmail.com with ESMTPSA id s3-20020a056a00194300b004f6664d26eesm27225931pfk.88.2022.03.31.02.20.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Mar 2022 02:20:18 -0700 (PDT) From: Shaoxuan Yuan To: git@vger.kernel.org Cc: vdye@github.com, derrickstolee@github.com, gitster@pobox.com, Shaoxuan Yuan Subject: [WIP v1 1/4] mv: check if out-of-cone file exists in index with SKIP_WORKTREE bit Date: Thu, 31 Mar 2022 17:17:52 +0800 Message-Id: <20220331091755.385961-2-shaoxuan.yuan02@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220331091755.385961-1-shaoxuan.yuan02@gmail.com> References: <20220331091755.385961-1-shaoxuan.yuan02@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Originally, moving a file which is not on-disk but exists in index as a SKIP_WORKTREE enabled cache entry, "giv mv" command errors out with "bad source". Change the checking logic, so that such file makes "giv mv" command warns with "advise_on_updating_sparse_paths()" instead of "bad source"; also user now can supply a "--sparse" flag so this operation can be carried out successfully. Signed-off-by: Shaoxuan Yuan --- I found a new problem introduced by this patch, it is written in the TODO. I still haven't found a better way to reconcile this conflict. Please enlighten me on this :-) builtin/mv.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/builtin/mv.c b/builtin/mv.c index 83a465ba83..32ad4d5682 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -185,8 +185,32 @@ int cmd_mv(int argc, const char **argv, const char *prefix) length = strlen(src); if (lstat(src, &st) < 0) { + /* + * TODO: for now, when you try to overwrite a + * with your as a sparse file, if you supply a "--sparse" + * flag, then the action will be done without providing "--force" + * and no warning. + * + * This is mainly because the sparse + * is not on-disk, and this if-else chain will be cut off early in + * this check, thus the "--force" check is ignored. Need fix. + */ + + int pos = cache_name_pos(src, length); + if (pos >= 0) { + const struct cache_entry *ce = active_cache[pos]; + + if (ce_skip_worktree(ce)) { + if (!ignore_sparse) + string_list_append(&only_match_skip_worktree, src); + else + modes[i] = SPARSE; + } + else + bad = _("bad source"); + } /* only error if existence is expected. */ - if (modes[i] != SPARSE) + else if (modes[i] != SPARSE) bad = _("bad source"); } else if (!strncmp(src, dst, length) && (dst[length] == 0 || dst[length] == '/')) { From patchwork Thu Mar 31 09:17:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shaoxuan Yuan X-Patchwork-Id: 12796914 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A30E8C433F5 for ; Thu, 31 Mar 2022 09:20:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233772AbiCaJWM (ORCPT ); Thu, 31 Mar 2022 05:22:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233766AbiCaJWJ (ORCPT ); Thu, 31 Mar 2022 05:22:09 -0400 Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2D8B149259 for ; Thu, 31 Mar 2022 02:20:21 -0700 (PDT) Received: by mail-pl1-x62b.google.com with SMTP id a16so5929435plh.13 for ; Thu, 31 Mar 2022 02:20:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Q0DaNskYbGCYt5zZU2NfxjM8erbDZCJr4CRuiuaPP4o=; b=oGrWmFlVbKbtxO+jSFzYJTaIPcVNw1bb8tqP8mN58JiTh2DDxjeWesvWCEJ/yFS3+2 vETJzIDpNLggcOmgvEKnKcF4rdusHjcBVm8l2O00LdpEEhawD2Gtunyxe93nc3FIE0WG 6rCK6yAQCygB/TDWRpwoet3LcIp6DegfKAQCHYLZeQlMnR14uVsmKhscccSXIJ2NK6uW oou1wEU9Boszjve2T/vrDjf7Vh4V7lVhnsvDR+CLcMN4Yd00V56mmuvRX1PkGHQ/VSJ3 BasAg0i8C+Qy1BCGJlrTjjvObqwWwfE+IsKXyp5ayU+y0sWqwY/9j06gK/X+Dg5O/z+n VeSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Q0DaNskYbGCYt5zZU2NfxjM8erbDZCJr4CRuiuaPP4o=; b=oT30ZJtEZ5xIK+CVjlndD53UVp/baL8xFab0gC3QMZd7Z+QcwGkTe3whUM9/HiPUzV 2/kjvjQ/ZoU/TH2knvhdGPxS5cxLTtxyu0G12gAW69nDO3dqtyrbeCrPt9gybBHudJwt m7bcdbNqTb1KTFCi24+fAxLxw68g/nXu7MYSFNt3jLmuT+4fAu3suWTf85HEYg8OO1RN GrUSLM8/888l4c690JfWBvc65uVk5qMGEL2rKcYb/9ejZ9ZipepI2YUVu/W7nMDpcKYT SYlljYolYfGwRNSebnelpB+hcRo1rII4Lzr90fSu0vzF59LjjlLsh7qw+OP9n5ptHt+F NoIQ== X-Gm-Message-State: AOAM530BcsHpnVu94QWcRQd5gDHT4sfQVjarKvIKh8pLOiI9L0exFhWf rd7RJLkg//2YhHXaIGRIH+0PApylYq0= X-Google-Smtp-Source: ABdhPJz7LIg9Vs6NgYBnNM2Sr0aPGy8tJaFMMj2XGSq//M5/8LQ9glFhb5chHgZ8NHyB2+ZUzL3y2g== X-Received: by 2002:a17:902:7c17:b0:154:a51a:d285 with SMTP id x23-20020a1709027c1700b00154a51ad285mr4362343pll.158.1648718421165; Thu, 31 Mar 2022 02:20:21 -0700 (PDT) Received: from ffyuanda.localdomain ([119.131.153.75]) by smtp.gmail.com with ESMTPSA id s3-20020a056a00194300b004f6664d26eesm27225931pfk.88.2022.03.31.02.20.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Mar 2022 02:20:20 -0700 (PDT) From: Shaoxuan Yuan To: git@vger.kernel.org Cc: vdye@github.com, derrickstolee@github.com, gitster@pobox.com, Shaoxuan Yuan Subject: [WIP v1 2/4] mv: add check_dir_in_index() and solve general dir check issue Date: Thu, 31 Mar 2022 17:17:53 +0800 Message-Id: <20220331091755.385961-3-shaoxuan.yuan02@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220331091755.385961-1-shaoxuan.yuan02@gmail.com> References: <20220331091755.385961-1-shaoxuan.yuan02@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Originally, moving a directory which is not on-disk due to its existence outside of sparse-checkout cone, "giv mv" command errors out with "bad source". Add a helper check_dir_in_index() function to see if a directory name exists in the index. Also add a SPARSE_DIRECTORY bit to mark such directories. Change the checking logic, so that such directory makes "giv mv" command warns with "advise_on_updating_sparse_paths()" instead of "bad source"; also user now can supply a "--sparse" flag so this operation can be carried out successfully. Signed-off-by: Shaoxuan Yuan --- Since I'm so new to C language (not an acquaintance until this patch), the "check_dir_in_index()" function I added might not be ideal (in terms of safety and correctness?). I have digging into the APIs provided in the codebase but I haven't found anything to do this very job: find out if a directory is in the index (am I missing something?). Probably because contents are stored in the index as blobs and they all represent regular files. So I came up with this dull solution... builtin/mv.c | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/builtin/mv.c b/builtin/mv.c index 32ad4d5682..9da9205e01 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -115,6 +115,25 @@ static int index_range_of_same_dir(const char *src, int length, return last - first; } +static int check_dir_in_index(const char *dir) +{ + int ret = 0; + int length = sizeof(dir) + 1; + char *substr = malloc(length); + + for (int i = 0; i < the_index.cache_nr; i++) { + memcpy(substr, the_index.cache[i]->name, length); + memset(substr + length - 1, 0, 1); + + if (strcmp(dir, substr) == 0) { + ret = 1; + return ret; + } + } + free(substr); + return ret; +} + int cmd_mv(int argc, const char **argv, const char *prefix) { int i, flags, gitmodules_modified = 0; @@ -129,7 +148,8 @@ int cmd_mv(int argc, const char **argv, const char *prefix) OPT_END(), }; const char **source, **destination, **dest_path, **submodule_gitfile; - enum update_mode { BOTH = 0, WORKING_DIRECTORY, INDEX, SPARSE } *modes; + enum update_mode { BOTH = 0, WORKING_DIRECTORY, INDEX, SPARSE, + SPARSE_DIRECTORY } *modes; struct stat st; struct string_list src_for_dst = STRING_LIST_INIT_NODUP; struct lock_file lock_file = LOCK_INIT; @@ -197,6 +217,8 @@ int cmd_mv(int argc, const char **argv, const char *prefix) */ int pos = cache_name_pos(src, length); + const char *src_w_slash = add_slash(src); + if (pos >= 0) { const struct cache_entry *ce = active_cache[pos]; @@ -209,6 +231,11 @@ int cmd_mv(int argc, const char **argv, const char *prefix) else bad = _("bad source"); } + else if (check_dir_in_index(src_w_slash) && + !path_in_sparse_checkout(src_w_slash, &the_index)) { + modes[i] = SPARSE_DIRECTORY; + goto dir_check; + } /* only error if existence is expected. */ else if (modes[i] != SPARSE) bad = _("bad source"); @@ -219,7 +246,9 @@ int cmd_mv(int argc, const char **argv, const char *prefix) && lstat(dst, &st) == 0) bad = _("cannot move directory over file"); else if (src_is_dir) { - int first = cache_name_pos(src, length), last; + int first, last; +dir_check: + first = cache_name_pos(src, length); if (first >= 0) prepare_move_submodule(src, first, @@ -230,7 +259,8 @@ int cmd_mv(int argc, const char **argv, const char *prefix) else { /* last - first >= 1 */ int j, dst_len, n; - modes[i] = WORKING_DIRECTORY; + if (!modes[i]) + modes[i] = WORKING_DIRECTORY; n = argc + last - first; REALLOC_ARRAY(source, n); REALLOC_ARRAY(destination, n); @@ -332,7 +362,8 @@ int cmd_mv(int argc, const char **argv, const char *prefix) printf(_("Renaming %s to %s\n"), src, dst); if (show_only) continue; - if (mode != INDEX && mode != SPARSE && rename(src, dst) < 0) { + if (mode != INDEX && mode != SPARSE && mode != SPARSE_DIRECTORY && + rename(src, dst) < 0) { if (ignore_errors) continue; die_errno(_("renaming '%s' failed"), src); @@ -346,7 +377,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix) 1); } - if (mode == WORKING_DIRECTORY) + if (mode == WORKING_DIRECTORY || mode == SPARSE_DIRECTORY) continue; pos = cache_name_pos(src, strlen(src)); From patchwork Thu Mar 31 09:17:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shaoxuan Yuan X-Patchwork-Id: 12796915 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB0B7C433EF for ; Thu, 31 Mar 2022 09:20:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233782AbiCaJWO (ORCPT ); Thu, 31 Mar 2022 05:22:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233779AbiCaJWK (ORCPT ); Thu, 31 Mar 2022 05:22:10 -0400 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC80B147500 for ; Thu, 31 Mar 2022 02:20:23 -0700 (PDT) Received: by mail-pj1-x1029.google.com with SMTP id h23-20020a17090a051700b001c9c1dd3acbso3033990pjh.3 for ; Thu, 31 Mar 2022 02:20:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=13Glgy9Q+WbRqZOZL75vVU/OVHKbuhWHm2bJJAqXxb0=; b=GkL70rv0hw7ic5XhuVUG0qoXuD9Wm81eumTHg9c1QwrF9EcWejmRXU+8SzQeelKxLO YLWiyJ9Typ47Nwp3NslMmUtGSJZAKWs20uCl2yzLUNPAmH7XwmIckyc4Vss/atq5M8JR aa5CLSmXb2huZIjYHHwcc3jeiBXADeABpL2Pg0GxLAV66uEYIJGld0ZEUzv1+31LZEfn p9Mc7JSdb6u8HYsRL18GBOWIGmuTUX0uICYoOeE6of9RiwCX452sK24hJI/wwgZZg2LB ZU4eDIRGn9whMqZ4UIK2ry8v5n2E+UhymLyIuUavg7qpEoli07rv8Ru4YVfX9xfpTnel kSpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=13Glgy9Q+WbRqZOZL75vVU/OVHKbuhWHm2bJJAqXxb0=; b=Geffu2SRCLjxrRZZalxedEj/q4pdi1CIuGnaI3kS7do5oVqO7A6q/BTlZldeD96gkR mhKlRDzaj8wS/9VrUYQ+FZ2PCl/tJgTq40Ct2VSREGZ47JPl/YBFRRhQqblmTgEqjDv8 yFthVXjLFf+AuuNaV0ITpSWK1Mgww5vac5Gdr2RoChhh2v9Onobg/OYXHUfv0q4e+/d3 yPWKcdJFQQYU/tDcloTFl9+Gu7ghYqQ4vxlMYQnPIicVGet7Q2FCJlFmkkLesSoA4B1n KaRLGJI5cDtl1BwQTJBMm/OY95DDgM2x8QB/bzH+3tTpisC2v8H9yZ0j1tZqptyV/nut CwUQ== X-Gm-Message-State: AOAM5301X8J7+8raKrP3hIAPqG8Pv1jQfYRNx2N+H4/q1YDLH7/3Tovc XUJdd53gwn5LMwdKYqODk+TDv2OK98E= X-Google-Smtp-Source: ABdhPJy+F8b6P36pEmLrdzwPaf7bVGkPZ0MmRKVIza0yc6KzbcZWKYM/fZxIB16yHjNF2f/plhSXhA== X-Received: by 2002:a17:902:ab8b:b0:156:16c0:dc6d with SMTP id f11-20020a170902ab8b00b0015616c0dc6dmr4465749plr.147.1648718423070; Thu, 31 Mar 2022 02:20:23 -0700 (PDT) Received: from ffyuanda.localdomain ([119.131.153.75]) by smtp.gmail.com with ESMTPSA id s3-20020a056a00194300b004f6664d26eesm27225931pfk.88.2022.03.31.02.20.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Mar 2022 02:20:22 -0700 (PDT) From: Shaoxuan Yuan To: git@vger.kernel.org Cc: vdye@github.com, derrickstolee@github.com, gitster@pobox.com, Shaoxuan Yuan Subject: [WIP v1 3/4] mv: add advise_to_reapply hint for moving file into cone Date: Thu, 31 Mar 2022 17:17:54 +0800 Message-Id: <20220331091755.385961-4-shaoxuan.yuan02@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220331091755.385961-1-shaoxuan.yuan02@gmail.com> References: <20220331091755.385961-1-shaoxuan.yuan02@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Originally, the SKIP_WORKTREE bit is not removed when moving an out-of-cone file into sparse cone, thus the moved file does not show up in the working tree. Hint the user to use "git sparse-checkout reapply" to reapply the sparsity rules to the working tree, by which the SKIP_WORKTREE bit is removed. Signed-off-by: Shaoxuan Yuan --- I offered this solution becasue I'm not sure how to turn a cache_entry's ce_flags back to a non-sparse state. I tried directly set it to 0 like this: ce->ce_flags = 0; But the behavior after this seems undefined. The file still won't show up in the working tree. And I found that "git sparse-checkout reapply" seems to be a nice fit for the job. But I guess if there is a way (there must be but I don't know) to do it direcly in the code, that could also be nice. builtin/mv.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/builtin/mv.c b/builtin/mv.c index 9da9205e01..5f511fb8da 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -138,6 +138,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix) { int i, flags, gitmodules_modified = 0; int verbose = 0, show_only = 0, force = 0, ignore_errors = 0, ignore_sparse = 0; + int advise_to_reapply = 0; struct option builtin_mv_options[] = { OPT__VERBOSE(&verbose, N_("be verbose")), OPT__DRY_RUN(&show_only, N_("dry run")), @@ -383,6 +384,11 @@ int cmd_mv(int argc, const char **argv, const char *prefix) pos = cache_name_pos(src, strlen(src)); assert(pos >= 0); rename_cache_entry_at(pos, dst); + if (!advise_to_reapply && + !path_in_sparse_checkout(src, &the_index) && + path_in_sparse_checkout(dst, &the_index)) { + advise_to_reapply = 1; + } } if (gitmodules_modified) @@ -392,6 +398,9 @@ int cmd_mv(int argc, const char **argv, const char *prefix) COMMIT_LOCK | SKIP_IF_UNCHANGED)) die(_("Unable to write new index file")); + if (advise_to_reapply) + printf(_("Please use \"git sparse-checkout reapply\" to reapply the sparsity.\n")); + string_list_clear(&src_for_dst, 0); UNLEAK(source); UNLEAK(dest_path); From patchwork Thu Mar 31 09:17:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shaoxuan Yuan X-Patchwork-Id: 12796916 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9ADBBC433FE for ; Thu, 31 Mar 2022 09:20:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233790AbiCaJWP (ORCPT ); Thu, 31 Mar 2022 05:22:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233770AbiCaJWM (ORCPT ); Thu, 31 Mar 2022 05:22:12 -0400 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9439A14CD17 for ; Thu, 31 Mar 2022 02:20:25 -0700 (PDT) Received: by mail-pf1-x433.google.com with SMTP id z16so21412082pfh.3 for ; Thu, 31 Mar 2022 02:20:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uhJB/k98NqSAG90wW6/14pz75cm0BLY12sePI0HIllg=; b=kRkAKU6deKz0KRVRPDcDzDT2ldibsZCpCzpwBAbwer6VzokYm06/Y9oeIwjV9D6GYm IRd2AuuRsnkWDTtOvH3mk8iLtm1JORvVi4kZcsUieR/fOupmDZy/HA2Q+PG5y5nM3qT4 6dNilEnMAeiH6tAQcBTc/z/Lu8i9wIk5ytfeHmyoXCX5Q7azLps4tAkvAs9Wxk/nrw4s 8VoF/RPBw4Jrg1oO4bhZFXYXu7JBnXUaRadI8HjFKLyCUeS4pKjjHsO8mVELjdqPPXj4 Fj64aqlhb4WhajNJibdeN4m3R9ZIxPiL4MFgBH4m+uBIPj7AsGMJhXjvnJNHxN2YZJCL kLLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uhJB/k98NqSAG90wW6/14pz75cm0BLY12sePI0HIllg=; b=e0iNfJ5vg3j/OomYK2osX1qXRBT11vjppVDw8/wO7fzsObr5MlM4hZRV8XIkWMxUoA HMsI5IbRy4yL+oVLjHJhcvFwboWW47pWoxAK4d2yZUtkpi2Cp1c6ue4+Rq8W2ceZxWGj R6K0NLbmno0L7ya/U9NiiBKP88lFaemjU0P3IBnTAQX3dOsnr/oEae69HQ5ak1hSrxUM zbJFj2yVd5AOCjqqn2/3vGiISH4b7IJ7+Z8Ifn4jsbHIWH35iw7LVg7r1qJECL5R8PgV YJJd5sxYBAaLwwRLTPPxYcdCxeW1rnYfrtvnlys129XuB52xBW4vsJjwZB6U2MHE4j0u 4JPg== X-Gm-Message-State: AOAM531jyjJHv34EiABbmGd2GKT9YKcyJK2SGkouTvgdzGXPA9t/ZCRH SBn9UOk2ClbfnmoOl0ya5B9PhVTVlK0= X-Google-Smtp-Source: ABdhPJxR6uf661nvhoAcP4GjVqdmACV5Crop3r8XBM/1IdQacCPbwTSgU3aUqSLpN2hnKiP8SPhz0g== X-Received: by 2002:a05:6a00:1252:b0:4fa:afcc:7d24 with SMTP id u18-20020a056a00125200b004faafcc7d24mr4387839pfi.85.1648718424976; Thu, 31 Mar 2022 02:20:24 -0700 (PDT) Received: from ffyuanda.localdomain ([119.131.153.75]) by smtp.gmail.com with ESMTPSA id s3-20020a056a00194300b004f6664d26eesm27225931pfk.88.2022.03.31.02.20.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Mar 2022 02:20:24 -0700 (PDT) From: Shaoxuan Yuan To: git@vger.kernel.org Cc: vdye@github.com, derrickstolee@github.com, gitster@pobox.com, Shaoxuan Yuan Subject: [WIP v1 4/4] t7002: add tests for moving out-of-cone file/directory Date: Thu, 31 Mar 2022 17:17:55 +0800 Message-Id: <20220331091755.385961-5-shaoxuan.yuan02@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220331091755.385961-1-shaoxuan.yuan02@gmail.com> References: <20220331091755.385961-1-shaoxuan.yuan02@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Add corresponding tests to test following situations: * 'refuse to move out-of-cone directory without --sparse' * 'can move out-of-cone directory with --sparse' * 'refuse to move out-of-cone file without --sparse' * 'can move out-of-cone file with --sparse' Signed-off-by: Shaoxuan Yuan --- t/t7002-mv-sparse-checkout.sh | 72 +++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/t/t7002-mv-sparse-checkout.sh b/t/t7002-mv-sparse-checkout.sh index 1d3d2aca21..efb260d015 100755 --- a/t/t7002-mv-sparse-checkout.sh +++ b/t/t7002-mv-sparse-checkout.sh @@ -206,4 +206,76 @@ test_expect_success 'refuse to move file to non-skip-worktree sparse path' ' test_cmp expect stderr ' +test_expect_success 'refuse to move out-of-cone directory without --sparse' ' + git sparse-checkout disable && + git reset --hard && + mkdir folder1 && + touch folder1/file1 && + git add folder1 && + git sparse-checkout init --cone && + git sparse-checkout set sub && + + test_must_fail git mv folder1 sub 2>stderr && + cat sparse_error_header >expect && + echo folder1/file1 >>expect && + cat sparse_hint >>expect && + test_cmp expect stderr +' + +test_expect_success 'can move out-of-cone directory with --sparse' ' + git sparse-checkout disable && + git reset --hard && + mkdir folder1 && + touch folder1/file1 && + git add folder1 && + git sparse-checkout init --cone && + git sparse-checkout set sub && + + git mv --sparse folder1 sub 1>actual 2>stderr && + test_must_be_empty stderr && + echo "Please use \"git sparse-checkout reapply\" to reapply the sparsity."\ + >expect && + test_cmp actual expect && + + git sparse-checkout reapply && + test_path_is_dir sub/folder1 && + test_path_is_file sub/folder1/file1 +' + +test_expect_success 'refuse to move out-of-cone file without --sparse' ' + git sparse-checkout disable && + git reset --hard && + mkdir folder1 && + touch folder1/file1 && + git add folder1 && + git sparse-checkout init --cone && + git sparse-checkout set sub && + + test_must_fail git mv folder1/file1 sub 2>stderr && + cat sparse_error_header >expect && + echo folder1/file1 >>expect && + cat sparse_hint >>expect && + test_cmp expect stderr +' + +test_expect_success 'can move out-of-cone file with --sparse' ' + git sparse-checkout disable && + git reset --hard && + mkdir folder1 && + touch folder1/file1 && + git add folder1 && + git sparse-checkout init --cone && + git sparse-checkout set sub && + + git mv --sparse folder1/file1 sub 1>actual 2>stderr && + test_must_be_empty stderr && + echo "Please use \"git sparse-checkout reapply\" to reapply the sparsity."\ + >expect && + test_cmp actual expect && + + git sparse-checkout reapply && + ! test_path_is_dir sub/folder1 && + test_path_is_file sub/file1 +' + test_done