Re: [PHP-DEV] git merge and generated files?
> Pierre, > > On Tue, Mar 27, 2012 at 5:43 PM, Stas Malyshev wrote: > > > Hi! > > > > >> Why would these change every 2nd commit? These only should change when > > >> you change the scanner, which happens very rarely. > > > > > > It depends what you do, but still annoying when it happens. > > > > > > But that does not answer the question... > > > > Looking at the patch, it looks like yours and git's line endings did not > > match, which may have caused the conflict. > > > Stas is right. Looks like the Windows CR line endings are causing it to > puke on ya. I'm assuming you're working in Windows, right? What Git > client are you using? > > If you're using Msysgit, it automatically converts these line endings for > you specifically to avoid this problem, but you have to select that option > during the installation process when it prompts you. I don't know if the > setting can be changed after install; my guess would be it can, but I have git config --global core.autocrlf true Global option obviously makes this apply to all repoes, not sure how it applies without it, as this is pretty much the only way to be able to work interoperably with Visual Studio. > no idea how. The easiest thing to do would be to just re-run the Msysgit > installer (if that's what you're using) and when prompted select the option > to auto-convert line endings (i.e. I think the option is something along > the lines of "Use Unix-Style line endings"). > > --Kris -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-DEV] git merge and generated files?
Hi, On Wed, Mar 28, 2012 at 11:48 AM, Niel Archer wrote: > git config --global core.autocrlf true > > Global option obviously makes this apply to all repoes, not sure how it > applies without it, as this is pretty much the only way to be able to > work interoperably with Visual Studio. Thanks for the headup about the new line thing, my mistake. Gustavo fixed it too. However it is not the topic of this thread :) Cheers, -- Pierre @pierrejoye | http://blog.thepimp.net | http://www.libgd.org -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-DEV] git merge and generated files?
2012/3/28 Niel Archer > > > git config --global core.autocrlf true > > Global option obviously makes this apply to all repoes, not sure how it > applies without it, as this is pretty much the only way to be able to > work interoperably with Visual Studio. Stas mail about autocrlf: http://www.mail-archive.com/internals@lists.php.net/msg57100.html > Also a small thing - gitfaq recommends git config core.autocrlf input, but > we have some files in win32 which do not work with this setting (at least > on my Mac). With regards, Alexander Moskaliov ir...@irker.net
[PHP-DEV] tag rename & pushes
Hi! This message is for anybody that is going to create tags in PHP's git repo. If you are not going to do that ever, you may skip this message. As you probably know, we recently made mass rename of tags from something like PHP-4.1.2-RC1 to php-4.1.2RC1. However, turns out that git does not delete old tags from local repositories when they are deleted/changed on remote. What this leads to is that if you ever fetched old tags, they are with you forever unless you delete them manually (see below about that). Please see more discussion about the topic here: http://stackoverflow.com/q/1841341/214196 http://thread.gmane.org/gmane.comp.version-control.git/168833 So what happened today is that I created a tag for 5.4.1RC1, and pushed it to the remote repo. Unknown to me, old tags left from before the rename were still sitting in my repo, and came out of the woods when the push was done, resulting to massive spam on php-cvs list and major embarrassment for me. I'd like to apologize for inconvenience caused and would propose for everybody that has push access to check their tags (git tag -l) and if there are any old tags, remove them. As far as I understand the best recipe is to do this: git tag -l | xargs git tag -d # This will delete all local tags git fetch # This will reimport tags from remote repo If anybody has better recipe on how to do it, please share. In any case, if you are ever going to tag PHP repo, please check your tag list and see if there are no stale ones left. I think you can also push single tag with "git push tag" but I'm not sure about the exact syntax. Git gurus are welcome to chime in. Most people (including me) always use push --tags, but the danger in that is obvious now so please learn from my fail and be careful :) -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227 -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
