From 8447e0cc2da14251ee2cbad423b118af85c638e2 Mon Sep 17 00:00:00 2001
From: Fabio Zuber <fabio.zuber@siemens.com>
Date: Tue, 13 Dec 2016 17:18:31 +0100
Subject: [PATCH] refactor commit author regex fixes #410

---
 src/zabapgit_definitions.prog.abap          | 3 ++-
 src/zabapgit_page_branch_overview.prog.abap | 2 +-
 src/zabapgit_page_merge.prog.abap           | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/zabapgit_definitions.prog.abap b/src/zabapgit_definitions.prog.abap
index 139849bfe..6cccf90c5 100644
--- a/src/zabapgit_definitions.prog.abap
+++ b/src/zabapgit_definitions.prog.abap
@@ -156,7 +156,8 @@ CONSTANTS: gc_newline TYPE abap_char1 VALUE cl_abap_char_utilities=>newline.
 CONSTANTS: gc_english TYPE spras VALUE 'E'.
 
 CONSTANTS: gc_root_dir    TYPE string VALUE '/',
-           gc_dot_abapgit TYPE string VALUE '.abapgit.xml' ##NO_TEXT.
+           gc_dot_abapgit TYPE string VALUE '.abapgit.xml' ##NO_TEXT,
+           gc_author_regex TYPE string VALUE '^([\w\s\.@\-_1-9]+) <(.*)> (\d{10}) .\d{4}$' ##NO_TEXT.
 
 CONSTANTS: BEGIN OF gc_action,
              repo_clone             TYPE string VALUE 'repo_clone',
diff --git a/src/zabapgit_page_branch_overview.prog.abap b/src/zabapgit_page_branch_overview.prog.abap
index 1c820ea70..0873eea5c 100644
--- a/src/zabapgit_page_branch_overview.prog.abap
+++ b/src/zabapgit_page_branch_overview.prog.abap
@@ -193,7 +193,7 @@ CLASS lcl_branch_overview IMPLEMENTATION.
       SPLIT ls_raw-body AT gc_newline INTO ls_commit-message lv_trash.
 
 * unix time stamps are in same time zone, so ignore the zone,
-      FIND REGEX '^([\w\s\.@]+) <(.*)> (\d{10}) .\d{4}$' IN ls_raw-author
+      FIND REGEX gc_author_regex IN ls_raw-author
         SUBMATCHES
         ls_commit-author
         ls_commit-email
diff --git a/src/zabapgit_page_merge.prog.abap b/src/zabapgit_page_merge.prog.abap
index df5f4c004..c415d02eb 100644
--- a/src/zabapgit_page_merge.prog.abap
+++ b/src/zabapgit_page_merge.prog.abap
@@ -283,7 +283,7 @@ CLASS lcl_merge IMPLEMENTATION.
       <ls_ancestor>-commit = lv_commit.
       <ls_ancestor>-tree = ls_commit-tree.
       <ls_ancestor>-body = ls_commit-body.
-      FIND REGEX '^[\w\s]+ <.*> (\d{10}) .\d{4}$' IN ls_commit-author
+      FIND REGEX gc_author_regex IN ls_commit-author
         SUBMATCHES <ls_ancestor>-time ##NO_TEXT.
       ASSERT sy-subrc = 0.
     ENDLOOP.