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

Re: [PATCH 3/3] stash: restore untracked files AFTER restoring tracked files

From
Derrick Stolee <stolee@gmail.com>
Date
Sep 8, 2021, 13:15 UTC
Message-ID
<53a16340-561b-dc67-5562-31d16460da84@gmail.com>
In-Reply-To
<ac8ca07481d2ed4156036c2441d10712a1b92b0e.1631065427.git.gitgitgadget@gmail.com>
On 9/7/2021 9:43 PM, Elijah Newren via GitGitGadget wrote:
Show 9 quoted lines
> From: Elijah Newren <newren@gmail.com>
> 
> If a user deletes a file and places a directory of untracked files
> there, then stashes all these changes, the untracked directory of files
> cannot be restored until after the corresponding file in the way is
> removed.  So, restore changes to tracked files before restoring
> untracked files.
> 
> There is no similar problem to worry about in the opposite directory,
s/directory/direction/ ?
> because untracked files are always additive.  Said another way, there's
> no way to "stash a removal of an untracked file" because if an untracked
> file is removed, git simply doesn't know about it.
Makes sense.

Thanks, -Stolee

Previous: Elijah Newren via GitGitGadgetNext: Junio C Hamano
Message 7 of 14 in “Fix D/F issues in stash”
  1. 0/3 Fix D/F issues in stashElijah Newren via GitGitGadget, Sep 8, 2021
  2. 1/3 t3903: document a pair of directory/file bugsElijah Newren via GitGitGadget, Sep 8, 2021
  3. Junio C HamanoSep 8, 2021
  4. 2/3 stash: avoid feeding directories to update-indexElijah Newren via GitGitGadget, Sep 8, 2021
  5. Johannes SchindelinSep 8, 2021
  6. 3/3 stash: restore untracked files AFTER restoring tracked filesElijah Newren via GitGitGadget, Sep 8, 2021
  7. Derrick StoleeSep 8, 2021
  8. Junio C HamanoSep 8, 2021
  9. Johannes SchindelinSep 8, 2021
  10. Derrick StoleeSep 8, 2021
  11. 0/3 Fix D/F issues in stashElijah Newren via GitGitGadget, Sep 10, 2021
  12. 1/3 t3903: document a pair of directory/file bugsElijah Newren via GitGitGadget, Sep 10, 2021
  13. 2/3 stash: avoid feeding directories to update-indexElijah Newren via GitGitGadget, Sep 10, 2021
  14. 3/3 stash: restore untracked files AFTER restoring tracked filesElijah Newren via GitGitGadget, Sep 10, 2021

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.