diff --git a/.gitignore b/.gitignore index 7a5bee5..5718d26 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,11 @@ +# Bitbucket token .repository-token -**/__pycache__/ -build/ -**/*.egg-info/ +# Virtual environment +venv/ + +# Build folders and artifacts dist/ +build/ +**/__pycache__/ +**/*.egg-info/ diff --git a/src/git_flow/command/base.py b/src/git_flow/command/base.py index efc5c08..2e51eee 100644 --- a/src/git_flow/command/base.py +++ b/src/git_flow/command/base.py @@ -170,7 +170,7 @@ class Command(ABC): def get_branch_env_and_type(self, branch: str) -> tuple[str, str]: components = branch.split("/") - target_branches = self.flowconfig["flow.branches"].split(" ") + target_branches = self.flowconfig["flow.branches"].split(",") if len(components) == 2: if components[0] not in BRANCH_TYPES: diff --git a/src/git_flow/git.py b/src/git_flow/git.py index d3392a7..11e23ff 100644 --- a/src/git_flow/git.py +++ b/src/git_flow/git.py @@ -38,7 +38,7 @@ class Git: @staticmethod 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() @staticmethod