From: "Andrew Arnott" <andrewarnott@gmail.com>
To: git@vger.kernel.org
Subject: Repo corrupted somehow?
Date: Mon, 3 Nov 2008 23:09:03 -0800 [thread overview]
Message-ID: <216e54900811032309s51c8cb1fr64054ff18c450b1d@mail.gmail.com> (raw)
I was just git commit'ing, and then I was doing a git rebase to squash
several commits into one when the rebase failed. I then did a
git checkout -f master
git reset --hard
but no matter what I do, git thinks that several files have changed.
The diff shows all the lines in these several files removed and then
added, yet without any changes made to them. git reset --hard doesn't
revert the change. When I jump around history with git checkout these
files remain in their "changed" state. I even tried "git clone" to
create a whole new repo, but one of these several files STILL
registered as changed before I made any changes.
Any idea what's wrong and how to recover?
Observe the below command buffer: (I can upload my repo so you can
clone it and perhaps repro it if you want).
Andrew@LACKY /c/git/dotnetoauth
$ git status
# On branch master
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
#
# modified: tools/Documentation.targets
# modified: tools/DotNetOpenAuth.Common.Settings.targets
# modified: tools/DotNetOpenAuth.Versioning.targets
# modified:
tools/Sandcastle/Presentation/vs2005/Content/reference_content.xml
# modified: tools/libcheck.ps1
# modified: tools/sandcastle.targets
#
no changes added to commit (use "git add" and/or "git commit -a")
Andrew@LACKY /c/git/dotnetoauth
$ git reset --hard
HEAD is now at 13d37b8 Patching up the bad merges in the phases.
Andrew@LACKY /c/git/dotnetoauth
$ git status
# On branch master
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
#
# modified: tools/Documentation.targets
# modified: tools/DotNetOpenAuth.Common.Settings.targets
# modified: tools/DotNetOpenAuth.Versioning.targets
# modified:
tools/Sandcastle/Presentation/vs2005/Content/reference_content.xml
# modified: tools/libcheck.ps1
# modified: tools/sandcastle.targets
#
no changes added to commit (use "git add" and/or "git commit -a")
next reply other threads:[~2008-11-04 7:10 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-04 7:09 Andrew Arnott [this message]
2008-11-04 7:34 ` Repo corrupted somehow? Andrew Arnott
2008-11-04 15:12 ` Andrew Arnott
2008-11-05 3:29 ` Jeff King
2008-11-05 4:21 ` Daniel Barkalow
[not found] ` <216e54900811042127id69b61fqbd9d001b8bc17a6a@mail.gmail.com>
2008-11-05 5:40 ` Andrew Arnott
2008-11-05 5:56 ` Daniel Barkalow
2008-11-05 12:26 ` Eyvind Bernhardsen
2008-11-08 15:19 ` Andrew Arnott
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=216e54900811032309s51c8cb1fr64054ff18c450b1d@mail.gmail.com \
--to=andrewarnott@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