Mmh, your reply here didn't make it to the mailing list, maybe because
it was multipart with html(??) or it just got lost.
Am 18.01.2012 18:57, schrieb Ron Eggler:
Try "git update-index --refresh", more info in this recent thread
"http://comments.gmane.org/__gmane.comp.version-control.__git/188291
<http://comments.gmane.org/gmane.comp.version-control.git/188291>"
I got this outputand nothing really changed(generally using TortoiseGit
on Windows but did this in the provided bash shell):
$ git update-index --refresh
MCU2.COF.txt: needs update
MCU2.bak: needs update
MCU2.c: needs update
MCU2.esym: needs update
MCU2.h: needs update
MCU2.hex: needs update
MCU2.lst: needs update
MCU2.mcp: needs update
[...]
Ok, "needs update" seems to be the non-porcelain version of 'M' (why 'M'
is more porcelain than "needs update" is a mystery to me ;-) respective
"Changes not staged for commit" in git status.
Well, what does it say when you do "git diff MCU2.h" ? There are 2
possibilities:
1) You see code differences. In that case you should be able to
recognize where and when these changes were comitted or not.
2) You see no difference or every line is listed as different even
though they seem to be equal. Possible reason is a mixup of line endings
as git on windows has to convert \r\n line endings to \n line endings
when it checks data in. This is controlled by config variables, and
maybe your config is slightly wrong.
In that case I would create a new repo with git init in bash (not
tortoise git!), and look at .git/config. Compare that with .git/config
of your mixed up repo. Also compare with .git/config of the repo on your
usb stick. As far as I know you should have core.autocrlf set to true on
Windows.
Alternatively or for a complete picture you could do "git config -l"
which gives you also global and system configuration variables if they
exist.
Another possible reason would be file names with same name but different
case. I mention this because there is a parallel thread on this mailing
list with a problem with tortoise git and windows. See
http://git.661346.n2.nabble.com/Bug-Git-checkout-fails-with-a-wrong-error-message-td7181244.html.
As suggested in that thread you should have the option core.ignorecase set.
Ok ,let's see:
I "found" the piece of code on my thumbdrive and it ultimately is copied
from my "old" working directory from the computer i don't have
anymore... "get create new local folders" means that I actually created
a new folder on my new machine and cloned the repo from git into it so
this would be my new working directory... now i have the code that
should be in there seperatetely in the directory from the thumb drive....
Does that make any more ssense?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html