From c8b3cf07464763a11c0f12352faa862470e32869 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20K=C3=A4semann?=
 <32765685+mkaesemann@users.noreply.github.com>
Date: Fri, 23 Feb 2024 12:37:51 +0100
Subject: [PATCH] Fix Filter Application Bug (#6824)

---
 src/repo/zcl_abapgit_repo.clas.abap | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/repo/zcl_abapgit_repo.clas.abap b/src/repo/zcl_abapgit_repo.clas.abap
index aa3330933..ebd1040c9 100644
--- a/src/repo/zcl_abapgit_repo.clas.abap
+++ b/src/repo/zcl_abapgit_repo.clas.abap
@@ -797,6 +797,12 @@ CLASS zcl_abapgit_repo IMPLEMENTATION.
     DATA lr_filter TYPE REF TO zcl_abapgit_repo_filter.
 
     rt_files = mt_remote.
+
+    "Filter Ignored Files prior to Applying a Filter
+    IF iv_ignore_files = abap_true.
+      remove_ignored_files( CHANGING ct_files = rt_files ).
+    ENDIF.
+
     IF ii_obj_filter IS NOT INITIAL.
       lt_filter = ii_obj_filter->get_filter( ).
 
@@ -811,10 +817,6 @@ CLASS zcl_abapgit_repo IMPLEMENTATION.
 
     ENDIF.
 
-    IF iv_ignore_files = abap_true.
-      remove_ignored_files( CHANGING ct_files = rt_files ).
-    ENDIF.
-
   ENDMETHOD.