Merge pull request #2 from oadultradeepfield/feat/add-squash-to-merge-step

Allow squash merge in the merge step

Author: woojiahao

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "repo-smith"
-version = "0.10.1"
+version = "0.11.0"
 authors = [{ name = "Jiahao, Woo", email = "woojiahao1234@gmail.com" }]
 description = "YAML-based configuration for initializing Git repositories for unit testing"
 readme = "README.md"

src/repo_smith/initialize_repo.py

@@ -278,6 +278,7 @@ def __parse_step(self, step: Any) -> Step:
                 id=id,
                 branch_name=step.get("branch-name"),
                 no_fast_forward=step.get("no-ff", False),
+                squash=step.get("squash", False),
             )
         elif step_type == StepType.REMOTE:
             if "remote-url" not in step:

src/repo_smith/steps/merge_step.py

@@ -9,9 +9,17 @@
 class MergeStep(Step):
     branch_name: str
     no_fast_forward: bool
+    squash: bool
 
     def execute(self, repo: Repo) -> None:
-        if self.no_fast_forward:
-            repo.git.merge(self.branch_name, "--no-edit", "--no-ff")
-        else:
-            repo.git.merge(self.branch_name, "--no-edit")
+        merge_args = [self.branch_name, "--no-edit"]
+
+        if self.squash:
+            merge_args.append("--squash")
+        elif self.no_fast_forward:
+            merge_args.append("--no-ff")
+
+        repo.git.merge(*merge_args)
+
+        if self.squash:
+            repo.git.commit("-m", f"Squash merge branch '{self.branch_name}'")