Commit in two steps.

First the actual change and changelog.yml (which is the same in all branches). Then CHANGES and package.xml (which are different on each branch).
horde · Oct 25, 2017 · d742737 · d742737
1 parent 6801c86
commit d742737
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/lib/Components/Component/Source.php b/lib/Components/Component/Source.php
@@ -233,8 +233,8 @@ public function changed(
                     $options
                 );
             }
-            if ($file && !empty($options['commit'])) {
-                $options['commit']->add($file, $this->_directory);
+            if ($file && !empty($options['commit2'])) {
+                $options['commit2']->add($file, $this->_directory);
             }
         }
         if (empty($options['nochanges'])) {
@@ -243,8 +243,8 @@ public function changed(
             } else {
                 $file = $helper->changes($log, $options);
             }
-            if ($file && !empty($options['commit'])) {
-                $options['commit']->add($file, $this->_directory);
+            if ($file && !empty($options['commit2'])) {
+                $options['commit2']->add($file, $this->_directory);
             }
         }
     }

diff --git a/lib/Components/Runner/Change.php b/lib/Components/Runner/Change.php
@@ -49,15 +49,16 @@ class Components_Runner_Change
     /**
      * Constructor.
      *
-     * @param Components_Config           $config  The configuration for the current
-     *                                             job.
+     * @param Components_Config           $config  The configuration for the
+     *                                             current job.
      * @param Components_Helper_ChangeLog $helper  Change log helper
      */
     public function __construct(
         Components_Config $config,
         Components_Helper_ChangeLog $helper,
         Components_Output $output
-    ) {
+    )
+    {
         $this->_config = $config;
         $this->_helper = $helper;
         $this->_output = $output;
@@ -74,16 +75,20 @@ public function run()
             $log = null;
         }
 
-        if (!empty($options['commit'])) {
+        if ($log && !empty($options['commit'])) {
             $options['commit'] = new Components_Helper_Commit(
                 $this->_output, $options
             );
+            $options['commit2'] = new Components_Helper_Commit(
+                $this->_output, $options
+            );
         }
         $this->_config->getComponent()->changed(
             $log, $this->_helper, $options
         );
-        if (!empty($options['commit'])) {
+        if ($log && !empty($options['commit'])) {
             $options['commit']->commit($log);
+            $options['commit2']->commit($log);
         }
     }
 }