[git-users] Re: CRLF will be replaced by LF warning
Even if you work on windows, I suggest using core.autocrlf = input, assuming you're not using notepad to edit text files but a nice ide that handles unix eol. Even notepad++ does it perfectly. And after this, just redo that big renormalization commit. On Friday, April 5, 2013 11:33:37 AM UTC+3, Carsten wrote: Hi all, I'm using Git version 1.8.0.msysgit.0 on Windows 7 with the following configuration: d:\Dev\Cafu git config core.eol d:\Dev\Cafu git config core.autocrlf false This used to work very well, until I created a .gitattributes file with this contents: d:\Dev\Cafu type .gitattributes *.h text *.hpp text *.c text *.cpp text *.txt text After that, I did a big renormalization commit as suggested in the .gitattributes man page (rm .git/index; git reset; ...; git commit). Everything worked as expected, tested on several Windows and Linux systems and several working copies. But now (on Windows), whenever I edit e.g. a .cpp file, subsequent commands like git diff, git add, git commit all show a warning like this: d:\Dev\Cafu git add Libs\GuiSys\CompBasics.cpp warning: CRLF will be replaced by LF in Libs/GuiSys/CompBasics.cpp. The file will have its original line endings in your working directory. Well... this seems to be entirely correct, but why do I see it? How can I get rid of this message? (As a side note, whatever causes this message seems to freak out TortoiseGit as well, as its side-by-side diff shows all lines in the file as moved, even all the lines that have not been modified at all.) I'd be very grateful for any hint! :-) Best regards, Carsten -- Dipl.-Inf. Carsten Fuchs Carsten Fuchs Software Industriegebiet 3, c/o Rofu, 55768 Hoppstï¿œdten-Weiersbach, Germany Internet: http://www.cafu.de | E-Mail: in...@cafu.de javascript: Cafu - the open-source game and graphics engine for multiplayer 3D action -- 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.
Re: [git-users] connectng 2 win PCs in local network - clone folder to other PC
If I understand correctly, you will need to permit sharing of the two repo folders so that the other PC is allowed to access the folder. So (XP thoughts) in the source PC, right click the repo folder in windows explorer, select sharing, and permit the appropriate User / PC to access the folder (full read write? It may be that you allow read to the repo, and read/write to the .git for pushing to it). In the second PC you should now be able to 'see' that folder in Win Expl and can do the clone. Give similar permissions to that folder. Assuming both PC's are active, with a working directory/folder, you need to avoid using master (i.e. checking out a common branch on both machines) because that causes a clash when you try and push. When I do this, I have a 'mine' and a 'theirs' (using real names) branches, so that I merge their work into mine, and they merge my work into theirs (from the fetched remote branch). We do have a master branch but we organise that one person will do that update (usually as a fast forward), publish it, and then checkout their own branch leaving 'master' in peace as a reference. Does that help Philip - Original Message - From: Leonidas Savvides To: git-users@googlegroups.com Sent: Saturday, April 06, 2013 10:24 AM Subject: [git-users] connectng 2 win PCs in local network - clone folder to other PC connectng 2 win PCs in local network if in one pc(USER-HP) i have a repo: cd C:/Users/User/Documents/PhoneGap/trnotes To connect with another pc(USER-PC) and clone (both installed git bash) this is correct: git clone User-HP@192.168.10.11:C:/Users/User/Documents/PhoneGap/trnotes theProject to create theProject in working folder git bash...(from USER-PC pc that accept the clone) (needed have .git this?)??? User-HP@192.168.10.11 ip of source pc USER-PC pc that accept the clone - destinated pc i must be able to write/read from windows explorer to User-HP@192.168.10.11:C:/Users/User/Documents/PhoneGap/trnotes from USER-PC pc that accept the clone??? for success?? In other words how setup permissions for above? -- 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. No virus found in this message. Checked by AVG - www.avg.com Version: 2013.0.3272 / Virus Database: 3162/6227 - Release Date: 04/05/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.
Re: [git-users] connectng 2 win PCs in local network - clone folder to other PC
What command to use for the push / copy? Also both directories must have .git folder... Initialized with git? Source PC is win7, and destined PC vista both 64bit. -- 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.
Re: [git-users] connectng 2 win PCs in local network - clone folder to other PC
From nothing. Simply start with `git init` on the first PC. (and `git add`; `git commit` etc. so you have something in the repo) Permit sharing. Got to second (or third, 4th, ..) PC, create directory, permit sharing, and then `git clone`. This should populate the directory with the 'copy' of the remote PC-1. Create and checkout your development branch for that PC-n. Note that you do not have a central bare repository machine. All your remotes are working machines, so there is a potential for collision if one person tries to push a branch that is checked out (and possibly dirty with in-work, uncommitted changes) on the remote machine. I believe git will refuse, but I'm not sure. You can now 'push' that branch back to PC-1, and 'fetch' from PC-1 any work they did. Like wise you can push work from PC-2 to PC-4 if they are want to exchange work on a feature they are working on (and fetch back) I would advice never to 'pull' in this situation as it attempts an auto merge, but to do a distinct two step of 'fetch' and then 'merge'. It gives you a breathing space just in case. (option to require it to be a ff, and clean tree?) Designate one machine as the location of the primary reference for which ever branch you end up using as master, and set up some admin to stage those updates gracefully with team emails to notify when updates are in place. Does that help? - Original Message - From: Leonidas Savvides lsepolis...@gmail.com To: git-users@googlegroups.com Sent: Saturday, April 06, 2013 2:07 PM Subject: Re: [git-users] connectng 2 win PCs in local network - clone folder to other PC What command to use for the push / copy? Also both directories must have .git folder... Initialized with git? Source PC is win7, and destined PC vista both 64bit. -- -- 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.
Re: [git-users] Re: Using Git to track system file customizations
On Tuesday, April 2, 2013 8:42:28 PM UTC+2, Dale Worley wrote:
From: Thomas Ferris Nicolaisen tfn...@gmail.com javascript:
Dale, from my perspective it's fairly obvious that a tool like Puppet,
Chef, or CFEngine is the way to go about here.
Those look way too heavy-weight for me.
Well, puppet can be pretty simple:
sudo apt-get install puppet
Now edit my-machine.pp to contain the following:
include foo
class foo {
file { /etc/foo:
ensure = directory,
owner = 'root',
group = 'root',
mode = '0755',
}
}
EOF
Now do:
sudo puppet apply my-machine.pp
Voila, /etc/foo has been created with the correct permissions.
Apart from creating directories, it can easily:
* modify permissions and ownership on any existing files
* install packages
* run shell-scripts
* start/stop services
* copy in files (supports templates)
* create users, groups and handle them
Of course you can make it very enterprisey if you want, but basically the
above is enough to customize your regular linux boxes to your demands.
--
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.
[git-users] Re: error: feeding unmodified file to diffcore
On Friday, April 5, 2013 3:43:13 AM UTC+2, Matěj Cepl wrote: Hi, in one git repository (from many many) I get a weird behavior, that whenever I finish some git command (or when the bash completion script finishes), I get a message error: feeding unmodified index.html to diffcore on stderr. Couple of commits ago, it was different file (in both cases truly unmodified). Using git-1.8.2-2.x86_64 on something between Fedora 18 and 19 (now closer to F19). Just to be sure, I have uploaded complete tarball of the repository to http://mcepl.fedorapeople.org/tmp/todo-backbone.tar.bz2 I have tried to Google for this error message, but the results I get were only unrelated (and none helped me anyway). Anybody has any idea, how to get rid of these error messages, please? I tried using your repository locally, and it works fine for me (Ubuntu 12.10 with . It could be something locally in your environment, like your file system or something. I would suggest, as this is a somewhat arcane error, that you ask at the Git developer list: https://gist.github.com/tfnico/4441562 -- 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.
[git-users] Re: error: feeding unmodified file to diffcore
I tried using your repository locally, and it works fine for me (Ubuntu 12.10 with . Oops, I forgot to complete that sentence. It should read: I tried using your repository locally, and it works fine for me (Ubuntu 12.10 with Git 1.7.9.5). -- 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.
