From: Steve Folly <steve@spfweb.co.uk>
To: git@vger.kernel.org
Subject: git stash pop not reapplying deletions
Date: Sun, 14 Feb 2010 19:45:03 +0000 (UTC) [thread overview]
Message-ID: <loom.20100214T200110-615@post.gmane.org> (raw)
Hi,
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):
$ git init stashtest
$ cd stashtest
$ mkdir dira
$ touch dira/a dira/b dira/c
$ git stage dira
$ git commit -m "added dira"
$ git mv dira dirb
$ git status # correctly shows renames
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# renamed: dira/a -> dirb/a
# renamed: dira/b -> dirb/b
# renamed: dira/c -> dirb/c
#
$ git stash
$ git stash pop
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# new file: dirb/a
# new file: dirb/b
# new file: dirb/c
#
# Changed but not updated:
# (use "git add/rm <file>..." to update what will be
committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# deleted: dira/a
# deleted: dira/b
# deleted: dira/c
#
Dropped refs/stash@{0} (cf9efdede3a3ee8e078192b574520fd2ed7f3d9b)
It's added the new files in dirb but hasn't deleted the old files in dira. Is
this right?
Regards,
Steve
next reply other threads:[~2010-02-14 19:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-14 19:45 Steve Folly [this message]
2010-02-14 22:08 ` git stash pop not reapplying deletions Thomas Rast
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=loom.20100214T200110-615@post.gmane.org \
--to=steve@spfweb.co.uk \
--cc=git@vger.kernel.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://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).