Thread Rating:
  • 0 Vote(s) - 0 Average
  • 1
  • 2
  • 3
  • 4
  • 5
Using git pull
#1
I was checking the threads on updates today and realized I still don't have a decent grasp on how this operates or how to use it properly. Below are the results of "git pull" on my system and I was wondering what they mean.

Code:
[mweaver@mail corebos]$ git pull

Updating 36c9eb9..6af60ce
error: Your local changes to the following files would be overwritten by merge:
        .gitignore
        Popup.php
        Smarty/templates/AdvanceFilter.tpl
        Smarty/templates/Buttons_List.tpl
        Smarty/templates/ComposeEmail.tpl
        Smarty/templates/CreateEmailTemplate.tpl
        Smarty/templates/CustomFieldMapping.tpl
        Smarty/templates/CustomView.tpl
        Smarty/templates/DetailViewEmailTemplate.tpl
        Smarty/templates/DetailViewUI.tpl
        Smarty/templates/EditViewHidden.tpl
        Smarty/templates/EditViewUI.tpl
        Smarty/templates/EmailDetailView.tpl
        Smarty/templates/Header.tpl
        Smarty/templates/Inventory/ProductDetails.tpl
        Smarty/templates/ListRoles.tpl
        Smarty/templates/ListViewEntries.tpl
        Smarty/templates/LoginHeader.tpl
        Smarty/templates/MergeFields.tpl
        Smarty/templates/Popup.tpl
        Smarty/templates/PopupContents.tpl
        Smarty/templates/QuickCreate.tpl
        Smarty/templates/QuickCreateHidden.tpl
        Smarty/templates/RelatedListContents.tpl
        Smarty/templates/Settings/LayoutBlockEntries.tpl
        Smarty/templates/Settings/ModuleManager/ModuleImportStep1.tpl
        Smarty/templates/Settings/ModuleManager/ModuleManagerAjax.tpl
        Smarty/templates/com_vtiger_workflow/EditTask.tpl
        Smarty/templates/com_vtiger_workflow/EditWorkflowTriggerTypes.tpl
        Smarty/templates/com_vtiger_workflow/ListWorkflows.tpl
        Smarty/templates/com_vtiger_workflow/taskforms/VTCreateTodoTask.tpl
        Smarty/templates/com_vtiger_workflow/taskforms/VTEntityMethodTask.tpl
        Smarty/templates/modules/Calendar4You/Buttons_List.tpl
        Smarty/templates/modules/Calendar4You/CalendarView.tpl
        Smarty/templates/modules/Calendar4You/EventListView.tpl
        Smarty/templates/modules/Calendar4You/Header.tpl
        Smarty/templates/modules/MailManager/Relationship.tpl
        Smarty/templates/modules/MailManager/index.tpl
        Smarty/templates/modules/ModComments/widgets/DetailViewBlockComment.tpl
        Smarty/templates/modules/PickList/AssignPicklistValues.tpl
        Smarty/templates/modules/RecycleBin/RecycleBin.tpl
        Smarty/templates/modules/RecycleBin/RecycleBinContents.tpl
        Smarty/templates/modules/SMSNotifier/DetailView.tpl
        Smarty/templates/modules/Vtiger/CustomFieldList.tpl
        build/HelperScripts/composerinstallmodule.php
        build/HelperScripts/evalwf.php
        build/changeSets/cffaq.php
        build/changeSets/cleanoptimizedatabase_140.php
        build/changeSets/coreboscp_rest.php
        build/migrate_from_vt6.php
        cron/MailScanner.service
        cron/SendReminder.service
        cron/modules/com_vtiger_workflow/com_vtiger_workflow.service
        data/VTEntityDelta.php
        database/DatabaseConnection.php
        htaccess.txt
        include/CustomFieldUtil.php
        include/InventoryHandler.php
        include/ListView/ListViewController.php
        include/QueryGenerator/QueryGenerator.php
        include/Webservices/Create.php
        include/Webservices/CustomerPortalWS.php
        include/Webservices/DataTransform.php
        include/Webservices/Login.php
        include/Webservices/LoginPortal.php
        include/Webservices/PreserveGlobal.php
        include/Webservices/ProductLines.php
        include/Webservices/Update.php
        include/Webservices/Utils.php
        include/Webservices/VtigerModuleOperation.php
        include/Webservices/WebserviceField.php
        include/events/VTEventTrigger.inc
        include/fields/DateTimeField.php
        include/install/resources/utils.php
        include/js/Inventory.js
        include/js/advancefilter.js
        include/js/de_de.lang.js
        include/js/dtlviewajax.js
        include/js/en_gb.lang.js
        include/js/es_es.lang.js
        include/js/es_mx.lang.js
        include/js/fr_fr.lang.js
        include/js/hu_hu.lang.js
        include/js/nl_nl.lang.js
        include/js/pt_br.lang.js
        include/js/vtlib.js
        include/language/de_de.lang.php
        include/language/en_gb.lang.php
        include/language/en_us.lang.php
        include/language/es_es.lang.php
        include/language/es_mx.lang.php
        include/language/fr_fr.lang.php
        include/language/hu_hu.lang.php
        include/language/nl_nl.lang.php
        include/language/pt_br.lang.php
        include/pclzip.lib.php
        include/utils/EmailTemplate.php
        include/utils/ExportUtils.php
        include/utils/InventoryUtils.php
        include/utils/MergeUtils.php
        include/utils/VTCacheUtils.php
        include/utils/VtlibUtils.php
        index.php
        modules/Accounts/Accounts.php
        modules/Accounts/CustomAction.php
        modules/Accounts/ProcessDuplicates.php
        modules/Accounts/language/e
Aborting
Mark

If I could work while on horseback that's where I'd be doing it. There's nothing like riding... Gives new meaning to the phrase, ride to live... live to ride.
Reply
#2
that is a lot of files with changes, I'd say too many for you to have changed manually. Maybe you uploaded them with some FTP tools that changed the line ends or the file permissions on the files has been changed...

You could do this to get an idea of what is happening:

Code:
git diff modules/Accounts/Accounts.php


or any other file in the list. That will show you the exact changes you have made and we can take it from there.
Joe
TSolucio
Reply
#3
Hi Joe,

What you're saying makes sense although since converting from VT to CoreBOS I haven't made any changes. When I converted I did the initial update and have left it alone. As far as I know the only code on the system is what came down from the master branch.

[mweaver@mail corebos]$ git diff modules/Accounts/Accounts.php
diff --git a/modules/Accounts/Accounts.php b/modules/Accounts/Accounts.php
old mode 100644
new mode 100755
Mark

If I could work while on horseback that's where I'd be doing it. There's nothing like riding... Gives new meaning to the phrase, ride to live... live to ride.
Reply
#4
OK. As I expected the change is on the file permission not the file content itself.

git controls the read/write permissions on the file. That permits us to distribute the project in a recommended (secure) file permission settings. For example, in the case of the Accounts.php file, we have set permission to 664 (or 644) but you have changed it to 755 probably due to your webserver configuration.

You can do two things:

1.- launch "git diff" on the files and then change their permission back to recommended state. Make sure you application keeps working.

2.- tell git to ignore file permission settings with a command like this:


Code:
git config core.fileMode false


http://lmgtfy.com/?q=git+ignore+file+permissions

Which one you use really depends on why you set the permissions to 755, if the application works with our default permission it is better to go with that, but if your particular server requires another set of permissions go with the second option.

Keep us posted.
Joe
TSolucio
Reply
#5
Ooooo... that got ugly fast! I set them to 755 originally because things wouldn't work with standard permissions, and at the time I was too lazy to figure out why. Guess now I'll have to.
Mark

If I could work while on horseback that's where I'd be doing it. There's nothing like riding... Gives new meaning to the phrase, ride to live... live to ride.
Reply
#6
Ok... I'll ask the obvious question... what would prevent CoreBOS from operating with standard permissions of 664 as opposed to 755 with which it operates normally. except of course git won't pull any changes down from the master repo.
Mark

If I could work while on horseback that's where I'd be doing it. There's nothing like riding... Gives new meaning to the phrase, ride to live... live to ride.
Reply
#7
I really don't know, each server configuration is a world in itself. For coreBOS the important thing is that the webserver user can read and write everywhere in the application directory tree.

Have you tried the "core.fileMode false" command? What did it do?
Joe
TSolucio
Reply
#8
(05-08-2015, 09:46 PM)joebordes Wrote: I really don't know, each server configuration is a world in itself. For coreBOS the important thing is that the webserver user can read and write everywhere in the application directory tree.

Have you tried the "core.fileMode false" command? What did it do?

Yes, that was the first thing I tried after finding that changing permissions to standard made things not work. Once I issued that command nothing changed. I get a long list of folders and files who's perms are not what git is expecting them to be.
Mark

If I could work while on horseback that's where I'd be doing it. There's nothing like riding... Gives new meaning to the phrase, ride to live... live to ride.
Reply
#9
Try migrating to a completely new install:

http://corebos.org/documentation/doku.php?id=en:upgradevt2cb

The idea is that your database is already close to what you need and coreBOS updater is going to take care of the missing details, so all you need is to get your code into place, so start with a fresh download of the code and copy your modifications into to it.

Please try this on a test run to make sure it is working before going for your production install and make backups (!)
Joe
TSolucio
Reply
#10
Hi Joe,

It must not be my day... I'm pretty certain I followed everything specifically as stated above, but when I attempt to open the test install I get a message on the screen that says:

Code:
Migration Incompleted.
Please contact your system administrator.
Mark

If I could work while on horseback that's where I'd be doing it. There's nothing like riding... Gives new meaning to the phrase, ride to live... live to ride.
Reply


Forum Jump:


Users browsing this thread: 1 Guest(s)