Merge branch 'hotfix/2.31.2'

Author: vmalloc

backslash/contrib/slash_plugin.py

@@ -342,10 +342,11 @@ def _update_scm_info(self, test_info):
             test_info['scm_revision'] = hexsha
             test_info['scm_dirty'] = bool(repo.untracked_files or repo.index.diff(None) or repo.index.diff(repo.head.commit))
             if self.client.api.info().endpoints.report_test_start.version >= 3:
-                test_info['scm_local_branch'] = repo.active_branch.name
-                tracking_branch = repo.active_branch.tracking_branch()
-                if tracking_branch is not None:
-                    test_info['scm_remote_branch'] = tracking_branch.name
+                if not repo.head.is_detached:
+                    test_info['scm_local_branch'] = repo.active_branch.name
+                    tracking_branch = repo.active_branch.tracking_branch()
+                    if tracking_branch is not None:
+                        test_info['scm_remote_branch'] = tracking_branch.name
         except Exception: # pylint: disable=broad-except
             _logger.warning('Error when obtaining SCM information', exc_info=True)
 

docs/changelog.rst

@@ -1,6 +1,8 @@
 Changelog
 =========
 
+* :release:`2.31.2 <14-9-2017>`
+* :bug:`54` Handle cases of detached head correctly when deducing local branch
 * :release:`2.31.1 <11-9-2017>`
 * :bug:`53` Use api session when constructing lazy queries
 * :release:`2.31.0 <10-9-2017>`