Merged in bugfix/list-branchs-on-environment (pull request #53)
bugfix: list branchs on environment Approved-by: Jonathan Teran
This commit is contained in:
@@ -46,7 +46,11 @@ class BranchCommand(Command):
|
|||||||
|
|
||||||
self.current_branch = Git.get_current_branch()
|
self.current_branch = Git.get_current_branch()
|
||||||
self.environments = self.flowconfig["flow.branches"].split(",")
|
self.environments = self.flowconfig["flow.branches"].split(",")
|
||||||
(current_environment, _) = self.get_branch_env_and_type(self.current_branch)
|
|
||||||
|
if self.current_branch in self.environments:
|
||||||
|
current_environment = self.current_branch
|
||||||
|
else:
|
||||||
|
(current_environment, _) = self.get_branch_env_and_type(self.current_branch)
|
||||||
|
|
||||||
if args.trash:
|
if args.trash:
|
||||||
self.show_branches(TRASH_BRANCH_PREFIX)
|
self.show_branches(TRASH_BRANCH_PREFIX)
|
||||||
|
|||||||
Reference in New Issue
Block a user