Commit ac9adcbd authored by Victor Nikulshin's avatar Victor Nikulshin
Browse files

Merge branch 'feature/git-running-in-english' into '2.x' 

Execute git while making sure it answers in English

This way, regardless of the default language in the environment,
our task will complete as expected.

See merge request !31
parents 4fd4a4a6 f7ff03d0

git.py

+2 −4
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ def _check_repo(repoLocalPath): 
        print green('---')

        print green('Verify repo in ' + repoLocalPath)



        remoteName = local('git remote', capture=True)

        remoteName = local('LC_ALL=C git remote', capture=True)



        filesStatusRawInfo = _get_files_status_information()

        print green('Verify local files status against current HEAD commit...')
@@ -120,9 +120,7 @@ def _check_local_branches_exist_on_remote(localBranchesRawInfo, remoteName): 
def _check_local_branches_status_vs_remote(localBranchesRawInfo, remoteName):

    nbWarnings = 0

    pushableBranches = []

    # on gere un git FR ou EN, a voir ce qu'on peut faire

    # pour une internationalisation plus cool..

    pattern = re.compile('.*\[.* (ahead|en avance de) .*\].*')

    pattern = re.compile('.*\[.* (ahead) .*\].*')

    for localBranchRawInfo in localBranchesRawInfo:

        if (pattern.match(localBranchRawInfo)):

            localBranchName = _get_branch_name(localBranchRawInfo)