From: Luke Hutchison <luke.hutch@gmail.com>
To: Dmitry Potapov <dpotapov@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git leaves repo in bad state in out-of-space situation
Date: Sun, 17 Apr 2011 15:09:18 -0400 [thread overview]
Message-ID: <BANLkTimVBVwz7c4=U0-zHhAWztewWYs7Qw@mail.gmail.com> (raw)
In-Reply-To: <BANLkTim4=eKQ2wq73Lf5zrjOND-r1n0XCw@mail.gmail.com>
Hi Dmitry,
On Sun, Apr 17, 2011 at 9:38 AM, Dmitry Potapov <dpotapov@gmail.com> wrote:
> The repository is not borked, it's just your working tree is in an
> inconsistent state, but it is easy to fix:
>
> git reset --hard HEAD
Ah, sounds like my intuition that simply freeing up space and then
re-pulling should have fixed the problem was wrong. Your explanation
makes sense.
> BTW, did you mean "git pull" above? Because if you did "git push"
> then those bogus changes are at the server now.
No, I work with a centralized repository which requires push
operations. I know this negates the benefit of distributed SCM.
> It always helps to run "gitk --all" to see what you are doing.
> [...]
> So, the general solution is only one:
>
> git reset --hard HEAD
Thank you for your patient responses to what turned out to be a very
basic question! My typical git workflow is very simple and has worked
fine until I ran out of disk space.
Luke
prev parent reply other threads:[~2011-04-17 19:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-17 6:40 git leaves repo in bad state in out-of-space situation Luke Hutchison
2011-04-17 13:38 ` Dmitry Potapov
2011-04-17 19:09 ` Luke Hutchison [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='BANLkTimVBVwz7c4=U0-zHhAWztewWYs7Qw@mail.gmail.com' \
--to=luke.hutch@gmail.com \
--cc=dpotapov@gmail.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.
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 NNTP newsgroup(s).