From: Chris Torek <firstname.lastname@example.org> To: Elijah Newren via GitGitGadget <email@example.com> Cc: Git List <firstname.lastname@example.org>, email@example.com, Derrick Stolee <firstname.lastname@example.org>, Elijah Newren <email@example.com> Subject: Re: [PATCH 3/3] stash: fix stash application in sparse-checkouts Date: Sat, 21 Nov 2020 04:47:13 -0800 [thread overview] Message-ID: <CAPx1GvfaZ-pRznnOQELBYQ7LCk-sr_-Rd0aPcJ6ghM5yt8LpnA@mail.gmail.com> (raw) In-Reply-To: <firstname.lastname@example.org> On Fri, Nov 20, 2020 at 8:56 AM Elijah Newren via GitGitGadget <email@example.com> wrote: > branch. However, this simplistic view doesn't quite work in practice, > because stash tweaks it a bit due to two factors: (1) flags like > --keep-index and --include-untracked (why we used two different verbs, > 'keep' and 'include', is a rant for another day) :-) Not that this should affect any of these changes, but I'd also note that the fact that using `-u` or `-a` makes a third commit that cannot be ignored later is a problem as well. (`git stash list` should probably annotate the listed stashes as to whether they are two- or three-commit stashes.) > stash has traditionally gotten this special behavior by first doing a > merge, and then when it's clean, applying a pipeline of commands to > modify the result. This series of commands for > unstaging-non-newly-added-files came from the following commands: > > git diff-index --cached --name-only --diff-filter=A $CTREE >"$a" > git read-tree --reset $CTREE > git update-index --add --stdin <"$a" > rm -f "$a" > > You might that between the merge that proceeded these commands and these s/might/might think/, perhaps? And, s/proceeded/preceded/, probably. (I didn't look closely at the rest of this but the idea seems sound.) Chris
next prev parent reply other threads:[~2020-11-21 12:49 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-20 16:53 [PATCH 0/3] Fix stash apply in sparse checkouts (and a submodule test) Elijah Newren via GitGitGadget 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 [this message] 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=CAPx1GvfaZ-pRznnOQELBYQ7LCk-sr_-Rd0aPcJ6ghM5yt8LpnA@mail.gmail.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --subject='Re: [PATCH 3/3] stash: fix stash application in sparse-checkouts' \ /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).