From: Jambunathan K <kjambunathan@gmail.com>
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: Juanma Barranquero <lekktu@gmail.com>, 9503@debbugs.gnu.org
Subject: bug#9503: 24.0.50; (vc-git): After applying a stash, refresh of *vc-dir* is a must
Date: Thu, 15 Sep 2011 13:37:55 +0530 [thread overview]
Message-ID: <81pqj2kz38.fsf@gmail.com> (raw)
In-Reply-To: <m3litq45ud.fsf@hase.home> (Andreas Schwab's message of "Thu, 15 Sep 2011 09:34:02 +0200")
Andreas Schwab <schwab@linux-m68k.org> writes:
> Jambunathan K <kjambunathan@gmail.com> writes:
>
>> Applying stash on a dirty tree produces the following error message from
>> git:
>>
>> "Cannot apply to a dirty working tree, please stage your changes"
>>
>> Even if one is applyin stashes serially, one HAS to always commit the
>> stash before applying the next one.
>
> Only if the stashes overlap.
That is what I would have expected but that is not what I observed with
a little test that stashed *two different* files on the same HEAD.
My git version is 1.7.2.3. The release notes for git 1.7.5.1 has the
following entry
,----
| * "git stash apply" used to refuse to work if there was any change in
| the working tree, even when the change did not overlap with the
| change the stash recorded.
`----
So I would (favorably) assume that the above bug is also present in
1.7.2.3 version of git. I agree that I shouldn't have based my opinions
on a buggy behaviour and trusted my instincts.
Anyways, the maintainers have agreed to the change I requested. So the
above note is only to clarify my eariler comments.
next prev parent reply other threads:[~2011-09-15 8:07 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-14 10:20 bug#9503: 24.0.50; (vc-git): After applying a stash, refresh of *vc-dir* is a must Jambunathan K
2011-09-14 11:09 ` Juanma Barranquero
2011-09-14 18:18 ` Jambunathan K
2011-09-14 18:45 ` Stefan Monnier
2011-09-14 18:49 ` Juanma Barranquero
2011-09-15 4:51 ` Jambunathan K
2011-09-15 4:35 ` Jambunathan K
2011-09-15 7:34 ` Andreas Schwab
2011-09-15 8:07 ` Jambunathan K [this message]
2013-11-15 5:08 ` Jambunathan K
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=81pqj2kz38.fsf@gmail.com \
--to=kjambunathan@gmail.com \
--cc=9503@debbugs.gnu.org \
--cc=lekktu@gmail.com \
--cc=schwab@linux-m68k.org \
/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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).