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

[PATCH v2 0/2] Safety for "stash save"

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 1, 2013, 21:59 UTC
Message-ID
<1372715951-3224-1-git-send-email-gitster@pobox.com>
In-Reply-To
<20130628150532.GD12252@machine.or.cz>

The second patch is the real thing, but "ls-files --killed" needed to be taught about submodules to avoid breaking "stash save" in a repository with submodules, as the new safety uses it to detect what will need to be killed (i.e. file D/F in the working tree getting removed because we need to check out D as a file, or file D in the working tree getting removed because we need to check out D/F as a file) when reverting to the state in HEAD.

Junio C Hamano (1):
  treat_directory(): do not declare submodules to be untracked
Petr Baudis (1):
  git stash: avoid data loss when "git stash save" kills a directory
 Documentation/git-stash.txt         | 12 ++++++++++--
 dir.c                               |  4 +---
 git-stash.sh                        | 12 ++++++++++++
 t/t3010-ls-files-killed-modified.sh | 23 ++++++++++++++++++++---
 t/t3903-stash.sh                    | 18 ++++++++++++++++++
 5 files changed, 61 insertions(+), 8 deletions(-)
-- 
1.8.3.2-798-g923e168
Previous: Petr BaudisNext: Junio C Hamano
Message 8 of 10 in “git stash: Avoid data loss when saving a stash”
  1. git stash: Avoid data loss when saving a stashPetr Baudis, Jun 28, 2013
  2. Junio C HamanoJun 28, 2013
  3. Junio C HamanoJun 28, 2013
  4. Junio C HamanoJun 28, 2013
  5. Petr BaudisJun 30, 2013
  6. Junio C HamanoJun 30, 2013
  7. Petr BaudisJul 6, 2013
  8. 0/2 Safety for "stash save"Junio C Hamano, Jul 1, 2013
  9. 1/2 treat_directory(): do not declare submodules to be untrackedJunio C Hamano, Jul 1, 2013
  10. 2/2 git stash: avoid data loss when "git stash save" kills a directoryJunio C Hamano, Jul 1, 2013

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.