Commit e03b7344 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Fix regex to retrieve branch name

parent 07382d5e

robot2doc/create_sols.py

+3 −3
Original line number Diff line number Diff line
@@ -166,12 +166,12 @@ def parse_branch_from_log(gitlog): 
    Returns the current git branch or None if the last commit is not parsed

    '''

    branch = re.search(r"(origin/)(\d+(\.?\d)+)(-dev)",gitlog)

    branch_master = re.search(r"(origin/)(master)",gitlog)

    branch_release = re.search(r"(origin/)(master|Release-\d)",gitlog)



    if bool(branch):

        return branch.group(2)+branch.group(4)

    elif bool(branch_master): 

        return branch_master.group(2)

    elif bool(branch_release): 

        return branch_release.group(2)

    else:

        return None