From dc14fa22dfe52b4cbc5a9e51ee166e4bc6f729ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20G=C3=BCnter?= <christianguenter@googlemail.com>
Date: Thu, 8 Mar 2018 10:36:39 +0000
Subject: [PATCH] Fix deserialization dependency ENHO -> ENHS

---
 src/objects/zcl_abapgit_object_enho_hook.clas.abap |  9 +++++----
 src/zcl_abapgit_objects.clas.abap                  | 10 ++++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/objects/zcl_abapgit_object_enho_hook.clas.abap b/src/objects/zcl_abapgit_object_enho_hook.clas.abap
index 4f1258d14..90aabbb13 100644
--- a/src/objects/zcl_abapgit_object_enho_hook.clas.abap
+++ b/src/objects/zcl_abapgit_object_enho_hook.clas.abap
@@ -133,7 +133,8 @@ CLASS zcl_abapgit_object_enho_hook IMPLEMENTATION.
           lv_package         TYPE devclass,
           ls_original_object TYPE enh_hook_admin,
           lt_spaces          TYPE ty_spaces_tt,
-          lt_enhancements    TYPE enh_hook_impl_it.
+          lt_enhancements    TYPE enh_hook_impl_it,
+          lx_enh_root        TYPE REF TO cx_enh_root.
 
     FIELD-SYMBOLS: <ls_enhancement> LIKE LINE OF lt_enhancements.
 
@@ -184,10 +185,10 @@ CLASS zcl_abapgit_object_enho_hook IMPLEMENTATION.
               spot             = <ls_enhancement>-spotname
               parent_full_name = <ls_enhancement>-parent_full_name ).
         ENDLOOP.
-        lo_hook_impl->if_enh_object~save( ).
+        lo_hook_impl->if_enh_object~save( run_dark = abap_true ).
         lo_hook_impl->if_enh_object~unlock( ).
-      CATCH cx_enh_root.
-        zcx_abapgit_exception=>raise( 'error deserializing ENHO hook' ).
+      CATCH cx_enh_root INTO lx_enh_root.
+        zcx_abapgit_exception=>raise( lx_enh_root->get_text( ) ).
     ENDTRY.
 
   ENDMETHOD.                    "zif_abapgit_object_enho~deserialize
diff --git a/src/zcl_abapgit_objects.clas.abap b/src/zcl_abapgit_objects.clas.abap
index c9e3ef9a0..6b7100299 100644
--- a/src/zcl_abapgit_objects.clas.abap
+++ b/src/zcl_abapgit_objects.clas.abap
@@ -130,7 +130,7 @@ ENDCLASS.
 
 
 
-CLASS ZCL_ABAPGIT_OBJECTS IMPLEMENTATION.
+CLASS zcl_abapgit_objects IMPLEMENTATION.
 
 
   METHOD changed_by.
@@ -581,11 +581,17 @@ CLASS ZCL_ABAPGIT_OBJECTS IMPLEMENTATION.
       APPEND <ls_result> TO rt_results.
     ENDLOOP.
 
+* ENHS has to be handled before ENHO
+    LOOP AT it_results ASSIGNING <ls_result> WHERE obj_type = 'ENHS'.
+      APPEND <ls_result> TO rt_results.
+    ENDLOOP.
+
     LOOP AT it_results ASSIGNING <ls_result>
         WHERE obj_type <> 'IASP'
         AND obj_type <> 'PROG'
         AND obj_type <> 'XSLT'
-        AND obj_type <> 'PINF'.
+        AND obj_type <> 'PINF'
+        AND obj_type <> 'ENHS'.
       APPEND <ls_result> TO rt_results.
     ENDLOOP.