git: status/diff not empty after clone

  Thread Rating:
  • 0 Votes - 0 Average
  • 1
  • 2
  • 3
  • 4
  • 5
Post Reply
CrystalP Offline
Team-XBMC Developer
Posts: 822
Joined: Apr 2010
Reputation: 18
Location: The Great North
Post: #1
What's the correct core.autocrlf config for the git tree? It looks like I have a related issue.

Immediately after cloning the git repository, git status returns this:
Code:
# On branch master
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#    modified:   xbmc/visualizations/XBMCProjectM/win32/pthreads/pthread.h
#    modified:   xbmc/visualizations/XBMCProjectM/win32/pthreads/sched.h
#    modified:   xbmc/win32/XBMC_PC.rc
#    modified:   xbmc/win32/my_ntddcdrm.h
#    modified:   xbmc/win32/pch.h
#    modified:   xbmc/win32/resource.h
#    modified:   xbmc/win32/strverscmp.cpp
#    modified:   xbmc/win32/svn_rev.tmpl
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#    status
no changes added to commit (use "git add" and/or "git commit -a")

and git diff outputs patches that recreate the whole files (- all lines followed by + all lines, apparently identical). I haven't done anything on the tree yet so it doesn't seem right.

I searched high and low for information and that seems to be about line endings. My core.autocrlf setting is 'true', which seems to be the recommended value on Windows, but there are all these false changes. 'off' silences the false changes but doesn't feel right.

I don't know if this is Windows specific. I'm on Win 7 32 with latest msysgit (1.7.0.2) and quite green with git. That could also be the problem Smile

Ideas anyone?
find quote
spiff Offline
Grumpy Bastard Developer
Posts: 12,233
Joined: Nov 2003
Reputation: 82
Post: #2
in general clueless about windows, but did you follow http://wiki.xbmc.org/index.php?title=Git_Usage

you want to use the git svn init since you're a commiter now by the looks of it Smile

Always read the XBMC online-manual, FAQ and search the forum before posting.
Do not e-mail XBMC-Team members directly asking for support. Read/follow the forum rules.
For troubleshooting and bug reporting please make sure you read this first.
find quote
CrystalP Offline
Team-XBMC Developer
Posts: 822
Joined: Apr 2010
Reputation: 18
Location: The Great North
Post: #3
Yes, I'm getting setup with that. I'll hunt down mixed CRLF / LF files then.
find quote