Merge branch 'feature-merge-history' into develop

2011-01-24 14:20:49 +01:00
parent 207eb1322d 116a7e34db
commit 07c94b97f9
6 changed files with 84 additions and 6 deletions
--- a/src/IDF/Scm/Git.php
+++ b/src/IDF/Scm/Git.php
@@ -116,6 +116,14 @@ class IDF_Scm_Git extends IDF_Scm
        return $this->_inObject($commit, 'branch');
    }

+    /**
+     * Will find the parents if available.
+     */
+    public function getExtraProperties($obj)
+    {
+        return (isset($obj->parents)) ? array('parents' => $obj->parents) : array();
+    }
+
    /**
     * @see IDF_Scm::getTags()
     **/