git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yves Goergen <nospam.list@unclassified.de>
To: Thomas Rast <trast@student.ethz.ch>
Cc: "Holger Hellmuth" <hellmuth@ira.uka.de>,
	"Jeff King" <peff@peff.net>, "Carlos Martín Nieto" <cmn@elego.de>,
	git@vger.kernel.org, "Erik Faye-Lund" <kusmabite@gmail.com>
Subject: Re: Bug? Git checkout fails with a wrong error message
Date: Tue, 17 Jan 2012 18:56:42 +0100	[thread overview]
Message-ID: <4F15B65A.8070009@unclassified.de> (raw)
In-Reply-To: <87ipkaogyj.fsf@thomas.inf.ethz.ch>

On 17.01.2012 09:45 CE(S)T, Thomas Rast wrote:
> It would also be interesting to know for how long this problem has
> existed.  You can search for the offending commit with something like
> 
>   git log --name-status --diff-filter=A -- "PosterWantsItCensored.*"
> 
> which should normally give you just one or two commits, namely the
> one(s) that introduced the two files.

I have found two commits adding that file. The second one has the file
with the then-already-present name modified and the new spelling added.
I could have noticed that at commit time, but that's the very commit
where I also renamed the original files and recreated them in the Forms
designer. 1) This may have led me to overlook that additional add and 2)
this may be the source of the spelling difference because the file was
newly created.

> As for the fix, there are two-and-two-thirds cases. (...)

That all sounds quite complicated. The "offending" commit is quite a
while back so replacing the last commit is not a solution.

This is just my personal repository that should help me out with finding
changes when I find something broken that wasn't before. Deleting and
recreating the "hub" (bare) and the other working repository would be
okay for me in this case. I have decided that it is also okay to fix the
error by new commits. To avoid all further issues with this, I have
renamed the file, committed the deletion, renamed it back and then
committed the add. The revsion in between won't compile, but it's got a
message with it and the compiler error would be obvious.

> You should really read up on this, e.g.
> 
>   http://tomayko.com/writings/the-thing-about-git
> 
> AFAIK everyone who groks the feature uses it daily.

It's on my to-read list. Looks like an interesting article from reading
the beginning of it.

I have done a test, too: I have set the core.ignorecase setting to false
(or deleted its entry) and then renamed one of the files in my working
directory only in case. TortoiseGit has offered me adding the new
spelling for a commit. After setting the core.ignorecase setting to
true, it has not offered any change to commit anymore. So it looks like
this is just the setting that every repository for Windows use should -
no - must have, and it was missing here.

Just like that stupid autocrlf that causes more issues than it solves. I
regularly see files with all lines changed and the diff says that both
files only differ in line endings. But I have no sure observation on
whether that value was set or unset in those cases. I'll have to look
after that, too.

These two config settings are not cloned with the repository, are they?

Also, TortoiseGit already sets ignorecase = true. So maybe the Visual
Studio provider does the init on its own and is missing that. Or I have
at some time cloned the repository and the setting wasn't copied over.

-- 
Yves Goergen "LonelyPixel" <nospam.list@unclassified.de>
Visit my web laboratory at http://beta.unclassified.de

  reply	other threads:[~2012-01-17 17:57 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-12 18:44 Bug? Git checkout fails with a wrong error message Yves Goergen
2012-01-13 12:50 ` Holger Hellmuth
2012-01-13 17:46   ` Yves Goergen
2012-01-13 19:28     ` Holger Hellmuth
2012-01-15  8:14       ` Yves Goergen
2012-01-16 11:07         ` Holger Hellmuth
2012-01-16 18:50           ` Yves Goergen
2012-01-16 19:09             ` Jeff King
2012-01-16 21:20               ` Yves Goergen
2012-01-16 21:27                 ` Jeff King
2012-01-17  7:41                   ` Yves Goergen
2012-01-16 19:17             ` Thomas Rast
     [not found]               ` <4F152767.9010104@unclassified.de>
2012-01-17  8:45                 ` Thomas Rast
2012-01-17 17:56                   ` Yves Goergen [this message]
2012-01-19 10:24                     ` Thomas Rast
2012-01-16 21:18             ` Erik Faye-Lund
2012-01-16 18:58           ` Yves Goergen
2012-01-13 17:37 ` Bug! Git merge also " Yves Goergen
2012-01-13 17:50   ` Jeff King
2012-01-13 18:49     ` Yves Goergen
2012-01-13 18:54       ` Jeff King
2012-01-13 19:05         ` Yves Goergen
2012-01-13 17:56   ` Carlos Martín Nieto
2012-01-13 18:59     ` Yves Goergen
2012-01-13 19:34       ` Jakub Narebski
2012-01-15  8:17         ` Yves Goergen
2012-01-15 10:08           ` Jakub Narebski

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=4F15B65A.8070009@unclassified.de \
    --to=nospam.list@unclassified.de \
    --cc=cmn@elego.de \
    --cc=git@vger.kernel.org \
    --cc=hellmuth@ira.uka.de \
    --cc=kusmabite@gmail.com \
    --cc=peff@peff.net \
    --cc=trast@student.ethz.ch \
    /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).