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

Re: [PATCH 3/3] stash: require a clean index to apply

From
bär <crashcookie@gmail.com>
Date
Jun 10, 2015, 18:19 UTC
Message-ID
<CADQvvWWpjZoXt7=8yAEt110pBTNtBfg7XfPOTbJRfPUH=J3OKw@mail.gmail.com>
In-Reply-To
<20150607124001.GA11042@peff.net>
On Sun, Jun 7, 2015 at 9:40 AM, Jeff King <peff@peff.net> wrote:
> Hrm. The new protection in v2.4.2 is meant to prevent you from losing
> your index state during step 4 when we run into a conflict. But here you
> know something that git doesn't: that we just created the stash based on
> this same state, so it should apply cleanly.

It is strange that `git stash --keep-index && git stash pop` while having something in the index, fails with a "Cannot apply stash: Your index contains uncommitted changes." error, even if we have a `--force` param it find it awkward that one needs to force applying/pop'ing even though the stash was created from the same snapshot where the stash is being merged with.

I understand the original issue, but at least it was expected, when you stash save/pop/apply, you should know what you are doing anyways.

-- 
Ber Clausen
Previous: Jeff KingNext: Jeff King
Message 4 of 16 in “Re: [PATCH 3/3] stash: require a clean index to apply”
  1. Jonathan KamensJun 5, 2015
  2. Jeff KingJun 7, 2015
  3. Jeff KingJun 7, 2015
  4. bärJun 10, 2015
  5. Jeff KingJun 10, 2015
  6. Junio C HamanoJun 10, 2015
  7. Jeff KingJun 10, 2015
  8. bärJun 10, 2015
  9. Junio C HamanoJun 15, 2015
  10. Revert "stash: require a clean index to apply"Jeff King, Jun 15, 2015
  11. Junio C HamanoJun 15, 2015
  12. Jonathan KamensJun 25, 2015
  13. Jeff KingJun 26, 2015
  14. Jonathan KamensJun 26, 2015
  15. Jeff KingJun 26, 2015
  16. Junio C HamanoJun 26, 2015

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.