Re: [PATCH] Revert "stash: require a clean index to apply"

2015-06-25 Thread Junio C Hamano
On Thu, Jun 25, 2015 at 9:03 PM, Jeff King wrote: > On Thu, Jun 25, 2015 at 09:12:55PM -0400, Jonathan Kamens wrote: > >> I encountered this issue in git 2.4.3 on Fedora 22. > > Ah, sorry, you're right. I must have fed the wrong sha1 to "git tag > --contains" earlier. > > I agree it can probably g

Re: [PATCH] Revert "stash: require a clean index to apply"

2015-06-25 Thread Jeff King
On Thu, Jun 25, 2015 at 09:12:55PM -0400, Jonathan Kamens wrote: > I encountered this issue in git 2.4.3 on Fedora 22. Ah, sorry, you're right. I must have fed the wrong sha1 to "git tag --contains" earlier. I agree it can probably go onto the v2.4.x maintenance track. It is already in v2.5.0-rc

Re: [PATCH] Revert "stash: require a clean index to apply"

2015-06-25 Thread Jonathan Kamens
Um. I encountered this issue in git 2.4.3 on Fedora 22. These lines appear in /usr/libexec/git-core/git-stash on my Fedora 22 system: git diff-index --cached --quiet --ignore-submodules HEAD -- || die "$(gettext "Cannot apply stash: Your index contains uncommitted cha

Re: [PATCH] Revert "stash: require a clean index to apply"

2015-06-25 Thread Jeff King
On Thu, Jun 25, 2015 at 05:49:11PM -0400, Jonathan Kamens wrote: > Is this revert going to be applied and released? It is on "master", and part of v2.5.0-rc0 (it is not part of v2.4.x, because the original problem was not there, either). -Peff -- To unsubscribe from this list: send the line "uns

Re: [PATCH] Revert "stash: require a clean index to apply"

2015-06-25 Thread Jonathan Kamens
Is this revert going to be applied and released? Sent from my Android device -Original Message- From: Junio C Hamano To: Jeff King Cc: "bär" , Jonathan Kamens , Git List Sent: Mon, 15 Jun 2015 4:11 PM Subject: Re: [PATCH] Revert "stash: require a clean index to ap

Re: [PATCH] Revert "stash: require a clean index to apply"

2015-06-15 Thread Junio C Hamano
Jeff King writes: > Subject: Revert "stash: require a clean index to apply" > > This reverts commit ed178ef13a26136d86ff4e33bb7b1afb5033f908. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at ht

[PATCH] Revert "stash: require a clean index to apply"

2015-06-15 Thread Jeff King
On Mon, Jun 15, 2015 at 10:42:18AM -0700, Junio C Hamano 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 f