From: Alan Knowles <alan@roojs.com>
Date: Wed, 31 Mar 2021 07:48:22 +0000 (+0800)
Subject: Fix #6661 - modify hooks to update timeshetet
X-Git-Url: http://git.roojs.org/?p=web.mtrack;a=commitdiff_plain;h=556ebe8020c96b9c50018f6e9f8fbbe13f91b933

Fix #6661 - modify hooks to update timeshetet
---

diff --git a/MTrack/CommitHookChangeEvent.php b/MTrack/CommitHookChangeEvent.php
index dd49598c..3319a965 100644
--- 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 e8cb12c1..ce006296 100755
--- 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');