Merged in bugfix/command-init-merge-errors (pull request #38)
bugfix: command init merge errors Approved-by: Jonathan Teran
This commit is contained in:
+8
-3
@@ -1,6 +1,11 @@
|
|||||||
|
# Bitbucket token
|
||||||
.repository-token
|
.repository-token
|
||||||
|
|
||||||
**/__pycache__/
|
# Virtual environment
|
||||||
build/
|
venv/
|
||||||
**/*.egg-info/
|
|
||||||
|
# Build folders and artifacts
|
||||||
dist/
|
dist/
|
||||||
|
build/
|
||||||
|
**/__pycache__/
|
||||||
|
**/*.egg-info/
|
||||||
|
|||||||
@@ -170,7 +170,7 @@ class Command(ABC):
|
|||||||
|
|
||||||
def get_branch_env_and_type(self, branch: str) -> tuple[str, str]:
|
def get_branch_env_and_type(self, branch: str) -> tuple[str, str]:
|
||||||
components = branch.split("/")
|
components = branch.split("/")
|
||||||
target_branches = self.flowconfig["flow.branches"].split(" ")
|
target_branches = self.flowconfig["flow.branches"].split(",")
|
||||||
|
|
||||||
if len(components) == 2:
|
if len(components) == 2:
|
||||||
if components[0] not in BRANCH_TYPES:
|
if components[0] not in BRANCH_TYPES:
|
||||||
|
|||||||
+1
-1
@@ -38,7 +38,7 @@ class Git:
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def set_config(config: dict[str, str], file: str | None = None):
|
def set_config(config: dict[str, str], file: str | None = None):
|
||||||
for key, value in config:
|
for key, value in config.items():
|
||||||
Git("config", key, value, file=file).exec()
|
Git("config", key, value, file=file).exec()
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
|
|||||||
Reference in New Issue
Block a user