Fix #6661 - modify hooks to update timeshetet

diff --git a/MTrack/CommitHookChangeEvent.php b/MTrack/CommitHookChangeEvent.php
index dd49598..3319a96 100644 (file)
--- a/MTrack/CommitHookChangeEvent.php
+++ b/MTrack/CommitHookChangeEvent.php
@@ -18,4 +18,6 @@ class MTrackCommitHookChangeEvent {
   /** a hash value that will be consistent when being merged from multiple
    * repos */
   public $hash;
+  
+  public $branch; 
 }

diff --git a/MTrackWeb/Hook/git.php b/MTrackWeb/Hook/git.php
index e8cb12c..ce00629 100755 (executable)
--- a/MTrackWeb/Hook/git.php
+++ b/MTrackWeb/Hook/git.php
@@ -110,6 +110,8 @@ class MTrackWeb_Hook_git extends MTrackWeb
                             echo "Skip - commit already exists\n";
                         }
                     }
+                    
+                    // in our system this happens when we merge normally.
                     foreach($checker->deferred as $ticket=> $info) {
                         foreach($info['changes'] as $ev) {
                             $cg = DB_DataObject::factory('mtrack_change');