git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 0/2] Fix git stash with skip-worktree entries

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Oct 28, 2019, 20:56 UTC
Message-ID
<nycvar.QRO.7.76.6.1910282152080.46@tvgsbejvaqbjf.bet>
In-Reply-To
<xmqqpniha9a8.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Mon, 28 Oct 2019, Junio C Hamano wrote:
Show 15 quoted lines
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > On Thu, 26 Sep 2019, Johannes Schindelin via GitGitGadget wrote:
> >
> >> My colleague Dan Thompson reported a bug in a sparse checkout,
> >> where git stash (after resolving merge conflicts and then making up
> >> their mind to stash the changes instead of committing them) would
> >> "lose" files (and files that were not even in the sparse checkout's
> >> cone!).
> >
> > I only realized _now_ that this patch has not made it anywhere.
>
> Yeah, I do not recall seeing any of the patches in the topic (nor
> the cover letter).  It is not clear to me what "lose" above means,
> which is an indication that I didn't read the topic a month ago X-<.

Sorry, in this context, "to lose a file" means that a `git stash` would record such a file as deleted. A subsequent `git stash apply` _would_ then delete it.

> Did it even get any review by skip worktree bit experts back then?
Sadly, it did not get any review back then...

Ciao, Dscho

Previous: Junio C HamanoNext: Junio C Hamano
Message 10 of 23 in “Fix git stash with skip-worktree entries”
  1. 0/2 Fix git stash with skip-worktree entriesJohannes Schindelin via GitGitGadget, Sep 26, 2019
  2. 1/2 update-index: optionally leave skip-worktree entries aloneJohannes Schindelin via GitGitGadget, Sep 26, 2019
  3. Junio C HamanoOct 28, 2019
  4. Johannes SchindelinOct 28, 2019
  5. Junio C HamanoOct 29, 2019
  6. 2/2 stash: handle staged changes in skip-worktree files correctlyJohannes Schindelin via GitGitGadget, Sep 26, 2019
  7. Junio C HamanoOct 28, 2019
  8. Johannes SchindelinOct 27, 2019
  9. Junio C HamanoOct 28, 2019
  10. Johannes SchindelinOct 28, 2019
  11. Junio C HamanoOct 29, 2019
  12. Johannes SchindelinOct 29, 2019
  13. 0/2 Fix git stash with skip-worktree entriesJohannes Schindelin via GitGitGadget, Oct 28, 2019
  14. 2/2 stash: handle staged changes in skip-worktree files correctlyJohannes Schindelin via GitGitGadget, Oct 28, 2019
  15. Junio C HamanoOct 30, 2019
  16. 1/2 update-index: optionally leave skip-worktree entries aloneJohannes Schindelin via GitGitGadget, Oct 28, 2019
  17. Junio C HamanoOct 30, 2019
  18. Johannes SchindelinOct 30, 2019
  19. Junio C HamanoNov 2, 2019
  20. Johannes SchindelinNov 2, 2019
  21. 0/2 Fix git stash with skip-worktree entriesJohannes Schindelin via GitGitGadget, Oct 30, 2019
  22. 1/2 update-index: optionally leave skip-worktree entries aloneJohannes Schindelin via GitGitGadget, Oct 30, 2019
  23. 2/2 stash: handle staged changes in skip-worktree files correctlyJohannes Schindelin via GitGitGadget, Oct 30, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.