Changes between Version 6 and Version 7 of faq/gitification

Timestamp:

May 26, 2012, 12:55:10 AM (12 years ago)

Author:

Bart

Comment:

Update module using git-subtree and git-rebase

faq/gitification

@@ -25 +25 @@
 We don't want the settings.php file in our repository as it contains database login credentials so we tell git to exclude it:
 {{{
-echo /settings.php >> .git/info/exclude
+echo settings.php >> .git/info/exclude
 }}}
 
@@ -45 +45 @@
 }}}
 
-We copy our settings.php to our repository directory, create a symbolic link from inside the core and delete the default.settings.php:
+We copy our settings.php to core/sites/default and delete the default.settings.php:
 {{{
-cp ~/settings.php .
-cd core/sites/default
-ln -s ../../../settings.php
-git rm default.settings.php
-cd ../../../
-git add core/sites/default/settings.php
-git commit "Add symbolic link to settings.php."
+cp ~/settings.php core/sites/default
+git rm core/sites/default/default.settings.php
+git commit "Deleted default.settings.php."
 }}}
 
@@ -60 +56 @@
 == Drupal modules ==
 
-Normally, Drupal modules are installed under sites/default/modules. This would be fine with our approach but it would create unnecessary huge merges when updating the core and it keeping all parts separately accessible from the root directory of our installation is much clearer arranged. So we create a modules (and perhaps also a files, libraries and themes) directory and a symbolic link to it:
+Normally, Drupal modules are installed under sites/default/modules. This would be fine with our approach but it would create unnecessary huge merges when updating the core and it keeping all parts separately accessible from the root directory of our installation is much clearer arranged. So we create a modules (and perhaps also a files, libraries and themes) directory, a symbolic link to it and add commit the link:
 {{{
 mkdir modules
@@ -66 +62 @@
 ln -s ../../../modules
 cd ../../../
+git add core/sites/default/modules
+git commit -m "Add symbolic link to modules directory."
 }}}
 
@@ -89 +87 @@
 }}}
 
-As our core directory is not empty, we can add the symbolic link to our modules directory:
+== Update a patched module ==
+
+First, we create a new [http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging branch] containing the version of our module we want to update to. As we have already added i18n as a remote we can checkout the desired version in a separate branch using the corresponding [http://git-scm.com/book/en/Git-Basics-Tagging tag]. As long as there are no [http://git.661346.n2.nabble.com/1-8-0-Remote-tag-namespace-td5980437.html separate namespaces for remote tags] in git we definitely want to start with a git fetch to be sure to refer to tag of the right module:
 {{{
-git add core/sites/default/modules
-git commit -m "Add symbolic link to modules directory."
+git fetch i18n-6.x-1.x
+git branch i18n-6.x-1.10 6.x-1.10
 }}}
 
-== Update a patched module ==
+Then we extract the patched version of our module into a branch along with it's history:
+{{{
+git subtree split --rejoin --prefix=modules/i18n --branch=i18n-linksunten
+}}}
 
+Now we can rebase our branch on top of the new version of the module:
+{{{
+git rebase i18n-6.x-1.10 i18n-linksunten
+}}}
+
+Finally, we have to merge the patched new version into our master branch:
+{{{
+git subtree merge --squash --prefix=modules/i18n i18n-linksunten
+}}}
+
+After that, you can delete the two branches:
+{{{
+git branch -D i18n-6.x-1.10 i18n-linksunten
+}}