Correct hook execution order

objectscript · Mar 29, 2018 · a17f25c · a17f25c
1 parent a6a0fd7
commit a17f25c
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/isc/git/hook/Manager.cls b/isc/git/hook/Manager.cls
@@ -23,11 +23,20 @@ ClassMethod execute(directory As %String = "", ByRef hooks As %String = "", meth
 		do:directory'="" ..load(directory, .loadedHooks)
 		merge hooks = loadedHooks
 
-		/// Execute global hooks
-		do ..executeInternal(.hooks, method, "isc.git.hook.Global")
+		if (method="before") {
 
-		/// Execute local hooks
-		do ..executeInternal(.hooks, method, "isc.git.hook.Local")
+			/// Execute global hooks
+			do ..executeInternal(.hooks, method, "isc.git.hook.Global")
+
+			/// Execute local hooks
+			do ..executeInternal(.hooks, method, "isc.git.hook.Local")
+		} elseif (method="after") {
+			/// Execute local hooks
+			do ..executeInternal(.hooks, method, "isc.git.hook.Local")
+
+			/// Execute global hooks
+			do ..executeInternal(.hooks, method, "isc.git.hook.Global")
+		}
 	} catch ex {
 		set sc = ex.AsStatus()
 	}