From 9cfdbbb8feba37bdfeca89e7058cde31edce00f0 Mon Sep 17 00:00:00 2001 From: Mikhail Goncharov Date: Thu, 30 Jul 2020 09:20:19 +0200 Subject: [PATCH] fix git clenup --- scripts/phabtalk/apply_patch2.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/phabtalk/apply_patch2.py b/scripts/phabtalk/apply_patch2.py index 9565c42..6b5c284 100755 --- a/scripts/phabtalk/apply_patch2.py +++ b/scripts/phabtalk/apply_patch2.py @@ -74,6 +74,7 @@ class ApplyPatch: else: logging.info('repository exist, will reuse') self.repo = Repo(path) # type: Repo + # TODO: set origin url to fork os.chdir(path) logging.info(f'working dir {os.getcwd()}') @@ -109,7 +110,7 @@ class ApplyPatch: self._create_branch(base_revision) logging.info('git reset, git cleanup...') self.repo.git.reset('--hard') - self.repo.git.clean('-fdx') + self.repo.git.clean('-ffxdq') logging.info('Analyzing {}'.format(diff_to_str(revision_id))) if len(dependencies) > 0: logging.info('This diff depends on: {}'.format(diff_list_to_str(dependencies))) @@ -147,7 +148,7 @@ class ApplyPatch: self.repo.git.fetch('--all') self.repo.git.checkout('master') self.repo.git.reset('--hard') - self.repo.git.clean('-fdx') + self.repo.git.clean('-ffxdq') if 'upstream' not in self.repo.remotes: self.repo.create_remote('upstream', url=LLVM_GITHUB_URL) self.repo.remotes.upstream.fetch()