On 9/28/2021 2:46 AM, Elijah Newren wrote: > [Did some slight re-ordering of topics] > > On Mon, Sep 27, 2021 at 5:53 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > >> * ds/add-rm-with-sparse-index (2021-09-24) 13 commits >> - advice: update message to suggest '--sparse' >> - mv: refuse to move sparse paths >> - rm: skip sparse paths with missing SKIP_WORKTREE >> - rm: add --sparse option >> - add: update --renormalize to skip sparse paths >> - add: update --chmod to skip sparse paths >> - add: implement the --sparse option >> - add: skip tracked paths outside sparse-checkout cone >> - add: fail when adding an untracked sparse file >> - dir: fix pattern matching on dirs >> - dir: select directories correctly >> - t1092: behavior for adding sparse files >> - t3705: test that 'sparse_entry' is unstaged >> >> "git add", "git mv", and "git rm" have been adjusted to avoid >> updating paths outside of the sparse-checkout definition unless >> the user specifies a "--sparse" option. >> >> Will merge to 'next'? > > It would be nice to see the --diff-filter=u change, which you also > seemed to like[1]; but after that, yeah this is ready to merge down. > > [1] https://lore.kernel.org/git/xmqq35pppwsm.fsf@gitster.g/ Yes, I agree. I was waiting to see if more comments trickled in, but it seems stable now. Do you want me to re-roll the whole series, or do you want to apply the fixup below? Thanks, -Stolee ---- >8 ---- >From d279bd580ad3b66187f9a8c0370acc5bca7cc5b6 Mon Sep 17 00:00:00 2001 From: Derrick Stolee <dstolee@xxxxxxxxxxxxx> Date: Tue, 28 Sep 2021 09:30:10 -0400 Subject: [PATCH] fixup! t1092: behavior for adding sparse files Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx> --- t/t1092-sparse-checkout-compatibility.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh index a00e42fa233..ca91c6a67f8 100755 --- a/t/t1092-sparse-checkout-compatibility.sh +++ b/t/t1092-sparse-checkout-compatibility.sh @@ -192,7 +192,7 @@ test_sparse_unstaged () { for repo in sparse-checkout sparse-index do # Skip "unmerged" paths - git -C $repo diff --staged --diff-filter=ACDMRTXB -- "$file" >diff && + git -C $repo diff --staged --diff-filter=u -- "$file" >diff && test_must_be_empty diff || return 1 done } -- 2.33.0.vfs.0.0
