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 6, 2011, 23:01 UTC
Message-ID
<7vfwpvgf1w.fsf@alter.siamese.dyndns.org>
In-Reply-To
<7v7hb8l23q.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
Show 8 quoted lines
>> 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.
Please disregard this.

If the user is doing "stash apply" without --index, it is Ok for the index to be different from HEAD. On the other hand, if the "stash apply" is used with --index, even if the result conflicted in the working tree and then resolution gets marked with "git add" for conflicted paths, it is Ok to have a path that is unrelated to the "stash apply" already added to the index.

So I don't think there is no point to insist that the index is clean. I was just confused and was thinking about the "git merge" (where we must have a clean index, as we are going to commit the index as the result of the merge with conflict resolution).

Previous: Junio C HamanoNext: Jon Seymour
Message 8 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.