OK. I was confused. I thought (misunderstood) that you were running two 
separated git instances (one Windows, one Linux), each with it's own work tree. 
I see that is not correct.

What (I now think) you have is a single work tree 
but that you still have two separated git instances (one CYGWIN on Windows, one 
Fedora Linux) that access that same set of work files and it's repo's stored 

I would suspect that the two instances take slightly different stances (by 
default) on what they are doing with EOL conversion, and how the detect which 
files are 'text' and subject to eol normalisation.

I don't use Cygwin (I'll guess it thinks the FS is windows and needs 
conversion, but again it's trying to be Linux so might not), so I'll drop out 
at this point....


----- Original Message ----- 
  From: Matthew Johnson 
  To: git-users@googlegroups.com 
  Cc: Matthew Johnson ; Philip Oakley 
  Sent: Thursday, January 31, 2013 7:53 PM
  Subject: Re: [git-users] Re: Why Same Files show up with different Statuses 
in Git?

  Hi, Philip-

  Thanks for the response.

  Which 'settings' are you talking about? I am only aware of those referred to 
by "git config --list", and I don't see anything that would explain it -- 
especially not in Cygwin/Windows, where only user.name and user.email are set. 
Yet it is from Cygwin I have done all my submits and pushes (until I resolve 
the discrepancy, I am not going to risk executing it commands from Fedora).

  BTW: your phrase "work tree files in the two OS's" makes it sound like you 
are assuming I have two different workspaces under the two OSs. What I really 
have is one worskpace directory viewed either under Windows/Cygwin or with the 
same partition mounted on a filesystem under Fedora. So the files are exactly 
the same, though Cygwin does funny things with representing permissions, which 
might turn out to be relevant here. Does Git consider a file 'modified' if only 
the permissions are changed?

  Finally, the Git Book admits that plumbing commands are not meant for the 
average user or even really for the command line, so more specific guidance (if 
plumbing is really the way to go) would certainly be needed: which plumbing 
commands? Is there one which will tell me why it considers a given file 

  On Thursday, January 31, 2013 12:11:02 AM UTC-8, Philip Oakley wrote:
    Given what you say about your .ogg file, it is probable that git's 
heuristic thinks they are [in some cases] binary (perhaps they are unicode 
files which will contain Null bytes) and won't therefore convert the line 

    The Git for Windows and Linux version of Git have slightly different 
default settings, so do check what they are. The line [EOL] and file [EOF] 
ending converstion discussions are spread over two or three man pages, and do 
take a bit of time to appreciate all the different normalisation issues.

    You can also try expanding the repo's blobs (using plumbing commands), and 
comparing those to the work tree files in the two OS's to which bytes are being 
changed, and in which direction.

      ----- Original Message ----- 
      From: Matthew Johnson 
      To: git-...@googlegroups.com 
      Sent: Thursday, January 31, 2013 1:22 AM
      Subject: [git-users] Re: Why Same Files show up with different Statuses 
in Git?

      Good guess, I had not been thinking about the different EOLs, but all the 
files that show up as modified only under Fedora are .ogg files: no EOLs at 
all. Even weirder, the textual files, whether HTML or JavaScript, do not have 
this problem. So it is hard to see how EOL inconcistency could explain why 
sound files are showing up as modified.

      On Wednesday, January 30, 2013 11:30:28 AM UTC-8, Alex Lewis wrote: 
        I think this question on stackoverflow might help... - 

        Basically the problems stems to you using the same physical repo with 
two different types of Git client, one built to use Windows EOL and the other 
using Linux EOL. When you mix the two, I.e. work with a file in Linux when it 
was created whilst on Windows I think you'll run into problems. I think if you 
set up the Windows client correctly (or specifically use the .gitattributes 
file for the repository) I think you'll be ok. 


        On Wednesday, 30 January 2013 02:40:47 UTC, Matthew Johnson wrote: 
          I hate to cross post, but I can no longer see my message to the same 
effect at the Git mailing list, where I got no reply, so here we go: 

          First, some background. I have one hard disk separated into two 
partitions: one for the version of Windows 7 that shipped on this rather new 
Thinkpad (Windows 7 Professional SP1), the other for Fedora 17 (which I 
installed and keep up-to-date). Of course, it is rather easy to access the 
Windows partition from the F17 partition, which I
          have been doing with no noticeable problems: the File Explorer 
equivalent, Dolphin (the KDE equivalent) will automount the Windows
          partition as a filesystem under /media, I only have to enter the 
password for 'su'.

          I don't think it makes a difference, but for completeness I provide 
the options with which I find it mounted:

          /dev/sda2 on /media/Windows7_OS type fuseblk 

          Anyway, the problem is this: the very same files, e.g. 
          Johnson/MrEd/mr.ed/lesson1/images/home-icon.jpg show up as 'modified' 
when I type "git status" (in the mr.ed/ dir) using the F17 git client,
          but do not show up at all when I type "git status" under the Cygwin 
client. This problem is not on all files, only a few, predominantly in
          two directories. 

          Under Windows (cygwin) "git status" shows nothing to commit, only 
untracked files, which is what I expect; only under F17 do I get several 
modified files -- and these have old dates (e.g. Nov 27).

          Yes, that is another important note: I am running Cygwin on the 
Windows partition.

          The versions of things under the F17 partition are:

            Linux 3.7.3-101.fc17.x86_64 x86_64
            System:  Fedora release 17 (Beefy Miracle)
            KDE:  4.9.5

          git --version
          git version

          Under Cygwin, the git version is 1.7.9.

          Finally, I did check the git configuration to make sure the same 
user.name and user.email are set in both. And in both cases, I made mr.ed the 
current directory before executing "git status". Shouldn't that be enough? Is 
there anything else that must match in the git config?

      You received this message because you are subscribed to the Google Groups 
"Git for human beings" group.
      To unsubscribe from this group and stop receiving emails from it, send an 
email to git-users+...@googlegroups.com.
      For more options, visit https://groups.google.com/groups/opt_out.

      No virus found in this message.
      Checked by AVG - www.avg.com
      Version: 2013.0.2890 / Virus Database: 2639/6068 - Release Date: 01/30/13


  No virus found in this message.
  Checked by AVG - www.avg.com
  Version: 2013.0.2897 / Virus Database: 2639/6070 - Release Date: 01/31/13

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to