diff options
| author | Bernard Xiong <[email protected]> | 2021-05-17 19:23:50 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-05-17 19:23:50 +0800 |
| commit | 2f02e35388dbde818779dcb044ced14a3fe7b4a7 (patch) | |
| tree | 05ad71d65c4cd49e4ef33dc8ffbe3a82e44fc9e2 /tools/file_check.py | |
| parent | 84b2723649d45ab16fc26acf691591bd761ea715 (diff) | |
| parent | 975a2ef684e829a5b3815886d244301662a2d5b2 (diff) | |
Merge pull request #4701 from Guozhanxin/file_check
【完善】file_check.py 中检查变更文件的逻辑
Diffstat (limited to 'tools/file_check.py')
| -rw-r--r-- | tools/file_check.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/file_check.py b/tools/file_check.py index 046b2a009f..63767782b5 100644 --- a/tools/file_check.py +++ b/tools/file_check.py @@ -84,6 +84,7 @@ class CheckOut: try: os.system('git remote add rtt_repo {}'.format(self.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 status > git.txt') except Exception as e: |