Thread (3 messages) flat view 3 messages, 3 authors, 2016-06-15

Git Config Question

From: Shilpa Kulkarni <hidden>
Date: 2016-06-15 22:49:08

Hi

We are using git with a centralized repo. Some of the developers are
on windows, some are on linux. The build system (ant & ruby scripts
are used for build) runs on linux. The server on which the software
product is deployed runs on linux. We see a frequent problem:
1. Person X clones a repo.
So far all is good.
2. Person Y checks in code (commit & push). Checks in file a, b.
3. Person X does a 'git pull origin master'. Pull succeeds - however
'git status' shows file a, b as modified even though person X has done
nothing with these files. 'git checkout' does not work. Files keep
getting showed as modified. If person X wants to commit any changes -
he is forced to commit file a & b.

This happens only sometimes - but it is frequent. It is not specific
to whether Person Y was on linux or windows. Would having the right
configs solve this problem? Any guidelines on what config we should
use?

Someone has recommended we all use
core.safecrlf=false
core.autocrlf=false
But this would require running dos2unix cmd while running scripts on
linux which seems like an overhead.

Are these the only two configs that are important?

Any help is appreciated....

-Shilpa
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help