Git development
 help / color / mirror / Atom feed
From: Daniel Barkalow <barkalow@iabervon.org>
To: Andrew Arnott <andrewarnott@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Repo corrupted somehow?
Date: Tue, 4 Nov 2008 23:21:44 -0500 (EST)	[thread overview]
Message-ID: <alpine.LNX.1.00.0811042241450.19665@iabervon.org> (raw)
In-Reply-To: <216e54900811032309s51c8cb1fr64054ff18c450b1d@mail.gmail.com>

On Mon, 3 Nov 2008, Andrew Arnott wrote:

> 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.

That sounds like some failure of CRLF conversion, like it's converting all 
of the line endings somehow when writing to the working tree and then not 
expecting them to be different. Do you have some sort of interesting 
configuration for those? I wonder if you've got a .gitattributes that 
matches the names that git uses for the files, but are on a 
case-insensitive filesystem which lists those files in a way where their 
names don't match (or vice versa).

	-Daniel
*This .sig left intentionally blank*

  parent reply	other threads:[~2008-11-05  4:23 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-04  7:09 Repo corrupted somehow? Andrew Arnott
2008-11-04  7:34 ` Andrew Arnott
2008-11-04 15:12   ` Andrew Arnott
2008-11-05  3:29     ` Jeff King
2008-11-05  4:21 ` Daniel Barkalow [this message]
     [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=alpine.LNX.1.00.0811042241450.19665@iabervon.org \
    --to=barkalow@iabervon.org \
    --cc=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