From: Thomas Rast <trast@student.ethz.ch>
To: Steve Folly <steve@spfweb.co.uk>
Cc: <git@vger.kernel.org>
Subject: Re: git stash pop not reapplying deletions
Date: Sun, 14 Feb 2010 23:08:01 +0100 [thread overview]
Message-ID: <201002142308.01704.trast@student.ethz.ch> (raw)
In-Reply-To: <loom.20100214T200110-615@post.gmane.org>
On Sunday 14 February 2010 20:45:03 Steve Folly wrote:
>
> I'm not sure if I've found a bug in 'git stash' or if I'm using
> it the wrong way? (This is with git 1.6.6):
>
[eliding a lot everywhere to make it clearer]
> $ git status # correctly shows renames
> # renamed: dira/a -> dirb/a
> # renamed: dira/b -> dirb/b
> # renamed: dira/c -> dirb/c
> $ git stash
> $ git stash pop
> # Changes to be committed:
> # new file: dirb/a
> # new file: dirb/b
> # new file: dirb/c
> # Changed but not updated:
> # deleted: dira/a
> # deleted: dira/b
> # deleted: dira/c
The problem is that you aren't using --index, but still expecting it
to restore your index. If you change it to 'git stash pop --index',
everything will work as expected.
Yes, it does stage new files, but that is only to help you: otherwise
you could forget them before committing.
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2010-02-14 22:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-14 19:45 git stash pop not reapplying deletions Steve Folly
2010-02-14 22:08 ` Thomas Rast [this message]
2010-02-15 14:32 ` Steve Folly
2010-02-15 15:41 ` Thomas Rast
2010-02-15 16:01 ` [PATCH] stash pop: remove 'apply' options during 'drop' invocation Thomas Rast
2010-02-15 18:46 ` [PATCH v2] " Stephen Boyd
2010-02-15 21:09 ` git stash pop not reapplying deletions Steve Folly
2010-02-16 2:17 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201002142308.01704.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=steve@spfweb.co.uk \
/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://80x24.org/mirrors/git.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).