Merge pull request #3496 from lasote/feature/clean_git_get_branch

Fixed Git class, wrongly replacing characters from the branch name
conan-io · Sep 6, 2018 · d8e068f · d8e068f
2 parents 3cef81c + a54ac09
commit d8e068f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/conans/client/tools/scm.py b/conans/client/tools/scm.py
@@ -144,8 +144,6 @@ def get_branch(self):
             status = self.run("status -bs --porcelain")
             # ## feature/scm_branch...myorigin/feature/scm_branch
             branch = status.splitlines()[0].split("...")[0].strip("#").strip()
-            # Replace non alphanumeric
-            branch = re.sub('[^0-9a-zA-Z]+', '_', branch)
             return branch
         except Exception as e:
             raise ConanException("Unable to get git branch from %s\n%s" % (self.folder, str(e)))
diff --git a/conans/test/util/tools_test.py b/conans/test/util/tools_test.py
@@ -1217,12 +1217,15 @@ def _create_paths():
 
     def git_to_capture_branch_test(self):
         conanfile = """
+import re
 from conans import ConanFile, tools
 
 def get_version():
     git = tools.Git()
     try:
-        return "%s_%s" % (git.get_branch(), git.get_revision())
+        branch = git.get_branch()
+        branch = re.sub('[^0-9a-zA-Z]+', '_', branch)
+        return "%s_%s" % (branch, git.get_revision())
     except:
         return None