From: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> To: git@vger.kernel.org Cc: matheus.bernardino@usp.br, dstolee@microsoft.com, Elijah Newren <newren@gmail.com> Subject: [PATCH 0/3] Fix stash apply in sparse checkouts (and a submodule test) Date: Fri, 20 Nov 2020 16:53:39 +0000 Message-ID: <pull.919.git.git.1605891222.gitgitgadget@gmail.com> (raw) Heavier usage of sparse-checkouts at $DAYJOB is commencing. And an issue with git stash apply was found. git stash's implementation as a pipeline of forked commands presents some problems, especially when implemented atop of three commands that all behave differently in the presence of sparse checkouts. Add a testcase demonstrating some issues with git stash apply in a repository with a different set of sparse-checkout patterns at apply vs create time, clean up the relevant section of git stash code, and incidentally fix a submodule testcase unrelated to sparse checkouts. Provide some detailed commit messages explaining the issues along the way. NOTE: I found a couple minor issues with other commands in sparse checkouts while debugging this issue, but I don't yet have fixes for them and I can submit them separately. Elijah Newren (3): t7012: add a testcase demonstrating stash apply bugs in sparse checkouts stash: remove unnecessary process forking stash: fix stash application in sparse-checkouts builtin/stash.c | 130 +++++++++++++++++++++---------- t/lib-submodule-update.sh | 16 ++-- t/t7012-skip-worktree-writing.sh | 88 +++++++++++++++++++++ 3 files changed, 184 insertions(+), 50 deletions(-) base-commit: faefdd61ec7c7f6f3c8c9907891465ac9a2a1475 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-919%2Fnewren%2Fsparse-checkout-fixups-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-919/newren/sparse-checkout-fixups-v1 Pull-Request: https://github.com/git/git/pull/919 -- gitgitgadget
next reply other threads:[~2020-11-20 17:12 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-20 16:53 Elijah Newren via GitGitGadget [this message] 2020-11-20 16:53 ` [PATCH 1/3] t7012: add a testcase demonstrating stash apply bugs in sparse checkouts Elijah Newren via GitGitGadget 2020-11-20 16:53 ` [PATCH 2/3] stash: remove unnecessary process forking Elijah Newren via GitGitGadget 2020-11-20 16:53 ` [PATCH 3/3] stash: fix stash application in sparse-checkouts Elijah Newren via GitGitGadget 2020-11-21 12:47 ` Chris Torek 2020-11-22 3:47 ` Elijah Newren 2020-11-25 22:14 ` [PATCH 0/3] Fix stash apply in sparse checkouts (and a submodule test) Junio C Hamano 2020-11-26 5:31 ` Elijah Newren 2020-12-01 22:25 ` [PATCH v2 " Elijah Newren via GitGitGadget 2020-12-01 22:25 ` [PATCH v2 1/3] t7012: add a testcase demonstrating stash apply bugs in sparse checkouts Elijah Newren via GitGitGadget 2020-12-01 22:25 ` [PATCH v2 2/3] stash: remove unnecessary process forking Elijah Newren via GitGitGadget 2020-12-01 23:02 ` Junio C Hamano 2020-12-02 16:09 ` Elijah Newren 2020-12-01 22:25 ` [PATCH v2 3/3] stash: fix stash application in sparse-checkouts Elijah Newren 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=pull.919.git.git.1605891222.gitgitgadget@gmail.com \ --to=gitgitgadget@gmail.com \ --cc=dstolee@microsoft.com \ --cc=git@vger.kernel.org \ --cc=matheus.bernardino@usp.br \ --cc=newren@gmail.com \ /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
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git