From: Jonathan del Strother <maillist@steelskies.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: My stash wants to delete all my files
Date: Tue, 25 Sep 2007 10:27:06 +0100 [thread overview]
Message-ID: <DCBF8566-9B43-4EFA-A8B2-2EAB516C273F@steelskies.com> (raw)
In-Reply-To: <7vabrb8rin.fsf@gitster.siamese.dyndns.org>
On 25 Sep 2007, at 02:26, Junio C Hamano wrote:
> Jonathan del Strother <maillist@steelskies.com> writes:
>
>> $ 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}
>> ...
>> 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.
>
> ...
> Whenever anybody wonders where inadvertent reverting changes
> come from, two most likely reasons are incorrect push into the
> current branch's tip initiated from elsewhere, or incorrect
> fetch into the current branch's tip initiated from the
> repository.
I'm working on a single isolated repository, so haven't pushed,
pulled, fetched, or anything.
> git ls-tree stash@{1}
> git rev-parse stash@{1}^1
> git diff stash@{1}^1 stash@{1}^2
>
ls-tree is empty. rev-parse confirms I was on the right revision when
I stashed, and the diff shows everything being deleted.
> Does the third command show you what you thought you have
> told "git add" to put in the index just before you made the
> stash?
I don't think I git-added anything - just made changes to the working
copy. (It *does* stash those, right??)
I'm at a loss to explain what happened here...
next prev parent reply other threads:[~2007-09-25 9:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-24 13:12 My stash wants to delete all my files Jonathan del Strother
2007-09-25 1:26 ` Junio C Hamano
2007-09-25 9:27 ` Jonathan del Strother [this message]
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=DCBF8566-9B43-4EFA-A8B2-2EAB516C273F@steelskies.com \
--to=maillist@steelskies.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).