From: Derrick Stolee <derrickstolee@github.com> To: Victoria Dye via GitGitGadget <gitgitgadget@gmail.com>, git@vger.kernel.org Cc: newren@gmail.com, gitster@pobox.com, Victoria Dye <vdye@github.com> Subject: Re: [PATCH 2/7] stash: integrate with sparse index Date: Tue, 26 Apr 2022 08:53:52 -0400 [thread overview] Message-ID: <f332fec9-da00-0063-4c88-765fa3639ea1@github.com> (raw) In-Reply-To: <f6cf05a5bee9e4ebc174bab0385a13cc1cdb4014.1650908958.git.gitgitgadget@gmail.com> On 4/25/2022 1:49 PM, Victoria Dye via GitGitGadget wrote: > From: Victoria Dye <vdye@github.com> > > Enable sparse index in 'git stash' by disabling > 'command_requires_full_index'. > ensure_not_expanded () { > rm -f trace2.txt && > - echo >>sparse-index/untracked.txt && > + if test -z $WITHOUT_UNTRACKED_TXT Do we need quotes around "$WITHOUT_UNTRACKED_TXT"? I mean, I suppose we don't since the tests pass when this variable is unset, but I think it is a good practice to be careful about empty variables. Or am I wrong? > + then > + echo >>sparse-index/untracked.txt > + fi && > - ensure_not_expanded checkout-index -f a && > - ensure_not_expanded checkout-index -f --all && > - for ref in update-deep update-folder1 update-folder2 update-deep > - do > - echo >>sparse-index/README.md && > - ensure_not_expanded reset --hard $ref || return 1 > - done && > - Moving these to be within the stash tests is interesting. > +test_expect_success 'sparse-index is not expanded: stash' ' > + init_repos && > + > + echo >>sparse-index/a && > + ensure_not_expanded stash && > + ensure_not_expanded stash list && > + ensure_not_expanded stash show stash@{0} && > + ! ensure_not_expanded stash apply stash@{0} && > + ensure_not_expanded stash drop stash@{0} && > + > + echo >>sparse-index/deep/new && > + ! ensure_not_expanded stash -u && > + ( > + WITHOUT_UNTRACKED_TXT=1 && > + ! ensure_not_expanded stash pop > + ) && > + > + ensure_not_expanded stash create && > + oid=$(git -C sparse-index stash create) && > + ensure_not_expanded stash store -m "test" $oid && > + ensure_not_expanded reset --hard && > + ! ensure_not_expanded stash pop && > + > + ensure_not_expanded checkout-index -f a && > + ensure_not_expanded checkout-index -f --all && > + for ref in update-deep update-folder1 update-folder2 update-deep > + do > + echo >>sparse-index/README.md && > + ensure_not_expanded reset --hard $ref || return 1 > + done It is not obvious why that's necessary here. Perhaps a later change will build upon these checkout-index commands within this test? Thanks, -Stolee
next prev parent reply other threads:[~2022-04-26 12:54 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-25 17:49 [PATCH 0/7] Sparse index: integrate with 'git stash' Victoria Dye via GitGitGadget 2022-04-25 17:49 ` [PATCH 1/7] stash: expand sparse-checkout compatibility testing Victoria Dye via GitGitGadget 2022-04-25 17:49 ` [PATCH 2/7] stash: integrate with sparse index Victoria Dye via GitGitGadget 2022-04-25 21:34 ` Junio C Hamano 2022-04-26 12:53 ` Derrick Stolee [this message] 2022-04-26 15:26 ` Victoria Dye 2022-04-26 16:21 ` Junio C Hamano 2022-04-25 17:49 ` [PATCH 3/7] sparse-index: expose 'is_sparse_index_allowed()' Victoria Dye via GitGitGadget 2022-04-25 17:49 ` [PATCH 4/7] read-cache: set sparsity when index is new Victoria Dye via GitGitGadget 2022-04-25 21:35 ` Junio C Hamano 2022-04-25 17:49 ` [PATCH 5/7] merge-recursive: add merge function arg to 'merge_recursive_generic' Victoria Dye via GitGitGadget 2022-04-25 21:38 ` Junio C Hamano 2022-04-26 12:57 ` Derrick Stolee 2022-04-25 17:49 ` [PATCH 6/7] stash: merge applied stash with merge-ort Victoria Dye via GitGitGadget 2022-04-26 13:02 ` Derrick Stolee 2022-04-25 17:49 ` [PATCH 7/7] unpack-trees: preserve index sparsity Victoria Dye via GitGitGadget 2022-04-26 12:49 ` [PATCH 0/7] Sparse index: integrate with 'git stash' Derrick Stolee 2022-04-26 13:09 ` Derrick Stolee 2022-04-27 18:16 ` [PATCH v2 " Victoria Dye via GitGitGadget 2022-04-27 18:16 ` [PATCH v2 1/7] stash: expand sparse-checkout compatibility testing Victoria Dye via GitGitGadget 2022-04-27 18:16 ` [PATCH v2 2/7] stash: integrate with sparse index Victoria Dye via GitGitGadget 2022-04-27 18:16 ` [PATCH v2 3/7] sparse-index: expose 'is_sparse_index_allowed()' Victoria Dye via GitGitGadget 2022-04-27 18:16 ` [PATCH v2 4/7] read-cache: set sparsity when index is new Victoria Dye via GitGitGadget 2022-04-27 18:16 ` [PATCH v2 5/7] merge-recursive: add merge function arg to 'merge_recursive_generic' Victoria Dye via GitGitGadget 2022-05-06 7:23 ` Elijah Newren 2022-05-09 19:24 ` Victoria Dye 2022-05-10 7:06 ` Elijah Newren 2022-04-27 18:16 ` [PATCH v2 6/7] stash: merge applied stash with merge-ort Victoria Dye via GitGitGadget 2022-04-27 18:16 ` [PATCH v2 7/7] unpack-trees: preserve index sparsity Victoria Dye via GitGitGadget 2022-05-06 7:46 ` [PATCH v2 0/7] Sparse index: integrate with 'git stash' Elijah Newren 2022-05-10 23:32 ` [PATCH v3 0/6] " Victoria Dye via GitGitGadget 2022-05-10 23:32 ` [PATCH v3 1/6] stash: expand sparse-checkout compatibility testing Victoria Dye via GitGitGadget 2022-05-10 23:32 ` [PATCH v3 2/6] stash: integrate with sparse index Victoria Dye via GitGitGadget 2022-05-10 23:32 ` [PATCH v3 3/6] sparse-index: expose 'is_sparse_index_allowed()' Victoria Dye via GitGitGadget 2022-05-10 23:32 ` [PATCH v3 4/6] read-cache: set sparsity when index is new Victoria Dye via GitGitGadget 2022-05-10 23:32 ` [PATCH v3 5/6] stash: apply stash using 'merge_ort_nonrecursive()' Victoria Dye via GitGitGadget 2022-05-11 0:26 ` Junio C Hamano 2022-05-12 1:01 ` Jonathan Tan 2022-05-12 14:52 ` Elijah Newren 2022-05-12 16:55 ` Jonathan Tan 2022-05-12 14:51 ` Elijah Newren 2022-05-10 23:32 ` [PATCH v3 6/6] unpack-trees: preserve index sparsity Victoria Dye via GitGitGadget
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=f332fec9-da00-0063-4c88-765fa3639ea1@github.com \ --to=derrickstolee@github.com \ --cc=git@vger.kernel.org \ --cc=gitgitgadget@gmail.com \ --cc=gitster@pobox.com \ --cc=newren@gmail.com \ --cc=vdye@github.com \ --subject='Re: [PATCH 2/7] stash: integrate with sparse index' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox: https://80x24.org/mirrors/git.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).