bugfix: cambio la forma en la que se obtiene el first fork point entre 2 ramas
This commit is contained in:
+4
-10
@@ -63,19 +63,13 @@ class Git:
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def get_first_fork_point(branch: str, env: str):
|
def get_first_fork_point(branch: str, env: str):
|
||||||
boundary_commits = list(
|
# Lista de commits alcanzables por el entorno (por ejemplo, dev),
|
||||||
filter(
|
env_commits = Git("rev-list", env + "..." + branch, first_parent=True).lines()
|
||||||
lambda c: c.startswith("-"), # boundary commits
|
|
||||||
Git(
|
|
||||||
"rev-list", env + "..." + branch, topo_order=True, boundary=True
|
|
||||||
).lines(),
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
if not boundary_commits:
|
if not env_commits:
|
||||||
raise RuntimeError("No se encontro un commit base para realizar el rebase.")
|
raise RuntimeError("No se encontro un commit base para realizar el rebase.")
|
||||||
|
|
||||||
return boundary_commits[-1].removeprefix("-")
|
return Git("show", env_commits[-1] + "^", patch=False, format="%h").firstline()
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _get_references(kind: str):
|
def _get_references(kind: str):
|
||||||
|
|||||||
Reference in New Issue
Block a user