From: Jonathan del Strother <maillist@steelskies.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: My stash wants to delete all my files
Date: Mon, 24 Sep 2007 14:12:15 +0100 [thread overview]
Message-ID: <5A9D6E3B-7B0E-4414-9AFB-C1C8B2EE6A9D@steelskies.com> (raw)
Heya,
I've run into a problem with git stash. I suspect that I've already
lost the work that I tried to stash, but would like to know where I
went wrong.
I had some work in progress, wanted to check something from my last
commit, and typed "git stash". I forgot to "git stash apply"
immediately afterward, and carried on doing some more work related to
the stashed code. I realized that I'd got a stash that I wanted to
apply, and tried to restore it.
While trying to restore it, I typed "git stash --apply", which
actually created a new stash named "--apply". Ooops. Anyway, the
real problem is :
$ git stash list
stash@{0}: On master: --apply
stash@{1}: WIP on master: 09e3c30... Better handling of cell sizes in
the grid
$ git stash show stash@{1}
.gitignore | 3 -
AppController.h | 10 -
AppController.m | 30 -
English.lproj/InfoPlist.strings | Bin 202 -> 0 bytes
English.lproj/MainMenu.xib | 2560
---------------------------------
GLScene.h | 21 -
GLScene.m | 287 ----
Info.plist | 28 -
LayoutManager.h | 19 -
LayoutManager.m | 118 --
OpenGLTests.xcodeproj/project.pbxproj | 323 -----
OpenGLTests_Prefix.pch | 10 -
TheWall.h | 28 -
TheWall.m | 99 --
UserImage.h | 17 -
UserImage.m | 111 --
Utilities.h | 38 -
Utilities.m | 89 --
main.m | 14 -
19 files changed, 0 insertions(+), 3805 deletions(-)
Hmm. Looks like it's trying to delete all of my versioned files.
"git stash apply stash@{1}" confirms this. Obviously that's not what
I tried to stash - my WIP when I stashed was a few additions, a couple
of new unversioned files, and moving a few lines of code from one file
to another.
Any ideas what happened there? I can't seem to reproduce the problem
in a test repository.
Cheers,
Jon
next reply other threads:[~2007-09-24 13:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-24 13:12 Jonathan del Strother [this message]
2007-09-25 1:26 ` My stash wants to delete all my files Junio C Hamano
2007-09-25 9:27 ` Jonathan del Strother
2007-09-25 9:56 ` Johannes Schindelin
2007-09-25 10:22 ` Jonathan del Strother
2007-09-25 10:41 ` Johannes Schindelin
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=5A9D6E3B-7B0E-4414-9AFB-C1C8B2EE6A9D@steelskies.com \
--to=maillist@steelskies.com \
--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).