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

2015-06-10 Thread bär
On Sun, Jun 7, 2015 at 9:40 AM, Jeff King p...@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

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

2015-06-10 Thread bär
On Wed, Jun 10, 2015 at 4:27 PM, Jeff King p...@peff.net wrote: I dunno. With respect to the original patch, I am OK if we just want to revert it. This area of stash seems a bit under-designed IMHO, but if people were happy enough with it before, I do not think the safety benefit from ed178ef

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

2015-06-05 Thread bär
Hi folks, I'm not sure how to respond to a particular mail [1] while keeping this new one in the same thread, being that I just subscribed to the list and I can't find a Message-ID in [1][2] either, so please forgive me. I bumped to 2.4.2 and I'm experiencing the very same issue Jonathan Kamens