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

Re: [RFC/PATCH 2/2] stash: drop dirty worktree check on apply

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 5, 2011, 23:17 UTC
Message-ID
<7v7hb8l23q.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20110405230245.GA7631@sigill.intra.peff.net>
Jeff King <peff@github.com> writes:
Show 8 quoted lines
>   The same "robustness" comments for the save_work function apply
>   here.  You probably do not want to restore on a dirty tree; the
>   intended use case is "stash away, pull, then restore", so I
>   think it is Ok to assume that you will only be restoring on a
>   clean state (and it would make the implementation simpler).
>
> So perhaps there is no broken case at all, and it was just a matter of
> being overly conservative from the beginning.
Perhaps.

If we are going to treat this as another mergy operation, we should at least still make sure that the index is clean (i.e. "diff --cached" is empty), I think.

Previous: Jeff KingNext: Junio C Hamano
Message 7 of 9 in “stash: fix accidental apply of non-existent stashes”
  1. 1/2 stash: fix accidental apply of non-existent stashesJeff King, Apr 5, 2011
  2. 2/2 stash: drop dirty worktree check on applyJeff King, Apr 5, 2011
  3. Junio C HamanoApr 5, 2011
  4. Jeff KingApr 5, 2011
  5. Jeff KingApr 5, 2011
  6. Jeff KingApr 5, 2011
  7. Junio C HamanoApr 5, 2011
  8. Junio C HamanoApr 6, 2011
  9. Jon SeymourApr 5, 2011

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.