From: "Torsten Bögershausen" <tboegi@web.de>
To: Steven Robertson <srtrumpetaggie@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Git filesystem case-insensitive to case-sensitive system broken
Date: Sat, 7 Jan 2017 13:48:08 +0000 [thread overview]
Message-ID: <20170107134808.GA30644@tb-raspi> (raw)
In-Reply-To: <CALwf_moJFqCKcc5Q=CC6aSSUAGqXEFDKrJUkdwov8shqBRK=yg@mail.gmail.com>
On Fri, Jan 06, 2017 at 01:56:36PM -0800, Steven Robertson wrote:
> Hello,
>
> I was doing development on a linux box on AWS, when we found a code
> bug that had me switching to running the code on a Mac instead. We
> discovered that we had accidentally named two files the same when
> looked at case-insensitively, which made git commands afterwards
> display the wrong thing. It looked like this (ignoring some things
> that aren't relevant):
>
> $ git status
>
>
> modified: tests/test_system/show_19_L.txt
>
>
> no changes added to commit (use "git add" and/or "git commit -a")
>
> $ git checkout tests/test_system/show_19_L.txt
>
> $ git status
>
>
> modified: tests/test_system/show_19_l.txt
>
>
> no changes added to commit (use "git add" and/or "git commit -a")
>
> $ git checkout tests/test_system/show_19_l.txt
>
> $ git status
>
>
> modified: tests/test_system/show_19_L.txt
>
>
> no changes added to commit (use "git add" and/or "git commit -a")
>
> $ diff tests/test_system/show_19_L.txt tests/test_system/show_19_l.txt
>
> $
>
>
> Those two files are different in our repo, and as such git thinks that
> we modified one of them when we try and pull it down from github
> again.
>
>
> Thanks for looking at this!
> -- Steven
I assume that you are on Mac OS ?
This is what I would have done:
- find the twin of your file:
$ git ls-files | grep -i tests/test_system/show_19_L.txt
- Let's assume it is the little brother:
"tests/test_system/show_19_l.txt"
$ git mv tests/test_system/show_19_l.txt tests/test_system/show_19_l2.txt
- Check out the original:
$ git checkout tests/test_system/show_19_L.txt
- check:
$ git status
prev parent reply other threads:[~2017-01-07 13:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-06 21:56 Git filesystem case-insensitive to case-sensitive system broken Steven Robertson
2017-01-07 13:48 ` Torsten Bögershausen [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
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=20170107134808.GA30644@tb-raspi \
--to=tboegi@web.de \
--cc=git@vger.kernel.org \
--cc=srtrumpetaggie@gmail.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).