Merge pull request #4701 from Guozhanxin/file_check
【完善】file_check.py 中检查变更文件的逻辑
This commit is contained in:
commit
2f02e35388
|
@ -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:
|
||||||
|
|
Loading…
Reference in New Issue