Merge pull request #4701 from Guozhanxin/file_check

【完善】file_check.py 中检查变更文件的逻辑
This commit is contained in:
Bernard Xiong 2021-05-17 19:23:50 +08:00 committed by GitHub
commit 2f02e35388
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions

View File

@ -84,6 +84,7 @@ class CheckOut:
try: try:
os.system('git remote add rtt_repo {}'.format(self.rtt_repo)) os.system('git remote add rtt_repo {}'.format(self.rtt_repo))
os.system('git fetch rtt_repo') os.system('git fetch rtt_repo')
os.system('git merge rtt_repo/{}'.format(self.rtt_branch))
os.system('git reset rtt_repo/{} --soft'.format(self.rtt_branch)) os.system('git reset rtt_repo/{} --soft'.format(self.rtt_branch))
os.system('git status > git.txt') os.system('git status > git.txt')
except Exception as e: except Exception as e: