From: Jonathan Kamens <jkamens@quantopian.com>
To: Jeff King <peff@peff.net>
Cc: "Junio C Hamano" <gitster@pobox.com>, bär <crashcookie@gmail.com>,
"Git List" <git@vger.kernel.org>
Subject: Re: [PATCH] Revert "stash: require a clean index to apply"
Date: Thu, 25 Jun 2015 21:12:55 -0400 [thread overview]
Message-ID: <558CA717.2040400@quantopian.com> (raw)
In-Reply-To: <20150626002706.GA6367@peff.net>
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 changes.")"
They also appear in
https://github.com/git/git/blob/69f9a6e54a46c4a75dff680047a465d04cca20ca/git-stash.sh#L445
, which is the commit tagged v2.4.3.
In fact, it appears they were released in v2.4.2, at least according to
https://github.com/git/git/compare/v2.4.1...v2.4.2 .
So it appears to me that this patch was, in fact, released in v2.4.x and
therefore needs to be reverted in v2.4.x.
jik
On 06/25/2015 08:27 PM, Jeff King wrote:
> 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
next prev parent reply other threads:[~2015-06-26 1:13 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-05 0:43 [PATCH 3/3] stash: require a clean index to apply Jonathan Kamens
2015-06-07 12:40 ` Jeff King
2015-06-07 12:47 ` Jeff King
2015-06-10 18:19 ` bär
2015-06-10 18:56 ` Jeff King
2015-06-10 19:16 ` Junio C Hamano
2015-06-10 19:27 ` Jeff King
2015-06-10 21:54 ` bär
2015-06-15 17:42 ` Junio C Hamano
2015-06-15 18:27 ` [PATCH] Revert "stash: require a clean index to apply" Jeff King
2015-06-15 20:11 ` Junio C Hamano
2015-06-25 21:51 ` Jonathan Kamens
[not found] ` <f06e573d-02e3-47e9-85d8-3bb6551d72f5.maildroid@localhost>
2015-06-26 0:27 ` Jeff King
2015-06-26 1:12 ` Jonathan Kamens [this message]
2015-06-26 4:03 ` Jeff King
2015-06-26 4:15 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=558CA717.2040400@quantopian.com \
--to=jkamens@quantopian.com \
--cc=crashcookie@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.