Refactor code involved in git workflow

What does this MR do?

In preparation for !21739 (merged), this MR refactors some code and add some specs

Does this MR meet the acceptance criteria?

Conformity

• [ ] Changelog entry
• Merge request performance guidelines
• Style guides
• Separation of EE specific content