Skip to content

Commit 25af54a

Browse files
feat(merge-step): Add squash option in repo initializer
1 parent d5dd271 commit 25af54a

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/repo_smith/initialize_repo.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@ def __parse_step(self, step: Any) -> Step:
278278
id=id,
279279
branch_name=step.get("branch-name"),
280280
no_fast_forward=step.get("no-ff", False),
281+
squash=step.get("squash", False),
281282
)
282283
elif step_type == StepType.REMOTE:
283284
if "remote-url" not in step:

src/repo_smith/steps/merge_step.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
@dataclass
99
class MergeStep(Step):
1010
branch_name: str
11-
no_fast_forward: bool = False
12-
squash: bool = False
11+
no_fast_forward: bool
12+
squash: bool
1313

1414
def execute(self, repo: Repo) -> None:
1515
merge_args = [self.branch_name, "--no-edit"]

0 commit comments

Comments
 (0)