From f132e9972249ef0faaaf3e93a2db4c67a7cf1432 Mon Sep 17 00:00:00 2001
From: Rakshith Gore <58498218+goreraks@users.noreply.github.com>
Date: Sun, 28 Jun 2020 14:23:49 +0530
Subject: [PATCH] SCP1 Import Order (#3543)

Co-authored-by: Lars Hvam <larshp@hotmail.com>
---
 src/objects/zcl_abapgit_object_scp1.clas.abap | 2 +-
 src/objects/zcl_abapgit_objects.clas.abap     | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/objects/zcl_abapgit_object_scp1.clas.abap b/src/objects/zcl_abapgit_object_scp1.clas.abap
index 5b4d599c1..e18669101 100644
--- a/src/objects/zcl_abapgit_object_scp1.clas.abap
+++ b/src/objects/zcl_abapgit_object_scp1.clas.abap
@@ -398,7 +398,7 @@ CLASS ZCL_ABAPGIT_OBJECT_SCP1 IMPLEMENTATION.
 
 
   METHOD zif_abapgit_object~get_deserialize_steps.
-    APPEND zif_abapgit_object=>gc_step_id-abap TO rt_steps.
+    APPEND zif_abapgit_object=>gc_step_id-late TO rt_steps.
   ENDMETHOD.
 
 
diff --git a/src/objects/zcl_abapgit_objects.clas.abap b/src/objects/zcl_abapgit_objects.clas.abap
index 057b0d304..40fde6378 100644
--- a/src/objects/zcl_abapgit_objects.clas.abap
+++ b/src/objects/zcl_abapgit_objects.clas.abap
@@ -1100,6 +1100,11 @@ CLASS ZCL_ABAPGIT_OBJECTS IMPLEMENTATION.
       APPEND <ls_result> TO rt_results.
     ENDLOOP.
 
+* TOBJ has to be handled before ODSO
+    LOOP AT it_results ASSIGNING <ls_result> WHERE obj_type = 'TOBJ'.
+      APPEND <ls_result> TO rt_results.
+    ENDLOOP.
+
     LOOP AT it_results ASSIGNING <ls_result>
         WHERE obj_type <> 'IASP'
         AND obj_type <> 'PROG'
@@ -1110,7 +1115,8 @@ CLASS ZCL_ABAPGIT_OBJECTS IMPLEMENTATION.
         AND obj_type <> 'DDLS'
         AND obj_type <> 'SPRX'
         AND obj_type <> 'WEBI'
-        AND obj_type <> 'IOBJ'.
+        AND obj_type <> 'IOBJ'
+        AND obj_type <> 'TOBJ'.
       APPEND <ls_result> TO rt_results.
     ENDLOOP.