summaryrefslogtreecommitdiffstats
path: root/meta/lib/patchtest/repo.py
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib/patchtest/repo.py')
-rw-r--r--meta/lib/patchtest/repo.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/meta/lib/patchtest/repo.py b/meta/lib/patchtest/repo.py
index 6a7d7d2d3b..2cdd6736e4 100644
--- a/meta/lib/patchtest/repo.py
+++ b/meta/lib/patchtest/repo.py
@@ -21,12 +21,7 @@ class PatchTestRepo(object):
21 self.repodir = repodir 21 self.repodir = repodir
22 self.repo = git.Repo.init(repodir) 22 self.repo = git.Repo.init(repodir)
23 self.patch = mbox.PatchSeries(patch) 23 self.patch = mbox.PatchSeries(patch)
24 24 self.current_branch = self.repo.active_branch.name
25 if self.repo.head.is_detached:
26 self.current_commit = self.repo.head.commit.hexsha
27 self.current_branch = None
28 else:
29 self.current_branch = self.repo.active_branch.name
30 25
31 # targeted branch defined on the patch may be invalid, so make sure there 26 # targeted branch defined on the patch may be invalid, so make sure there
32 # is a corresponding remote branch 27 # is a corresponding remote branch
@@ -85,6 +80,6 @@ class PatchTestRepo(object):
85 self._patchmerged = True 80 self._patchmerged = True
86 81
87 def clean(self): 82 def clean(self):
88 self.repo.git.execute(['git', 'checkout', self.current_branch if self.current_branch else self.current_commit]) 83 self.repo.git.execute(['git', 'checkout', self.current_branch])
89 self.repo.git.execute(['git', 'branch', '-D', self._workingbranch]) 84 self.repo.git.execute(['git', 'branch', '-D', self._workingbranch])
90 self._patchmerged = False 85 self._patchmerged = False