将patch打入本地repo,通常可以通过下面四种方法进行操作
Checkout | git fetch https:xxxxxxx refs/changes/30/126030/2 && git checkout FETCH_HEAD
|
Cherry Pick | git fetch https:xxxxxxx refs/changes/30/126030/2 && git cherry-pick FETCH_HEAD |
Format Patch | git fetch https:xxxxxxx refs/changes/30/126030/2 && git format-patch -1 --stdout FETCH_HEAD |
Pull | git pull https:xxxxxxx refs/changes/30/126030/2 |
其中
cherry-pick: 在本地HEAD的基础上,加上commit的内容,并生成新的commitid。
checkout: checkout到commit时的状态,如果该commit patch后有新的commit 被merge,不会体现。此时分支名为(HEAD detached at FETCH_HEAD)
pull: 相当于git fetch https:xxxxxxx refs/changes/30/126030/2 && git merge FETCH_HEAD
工作中需要使用python实现gerrit patch set打入本地repo,实现方法有:
repo_path = /home/liurizhou/repo/test
git_repo = git.Repo(repo_path)
# checkout,Cherry-pick,format-patch 的实现方法,以checkout为例
git_repo.git.fetch('https:xxxxxxx', 'refs/changes/30/126030/2')
git_repo.git.checkout('FETCH_HEAD')
#pull 的实现方法
o = git_repo.remotes.origin
o.pull('refs/changes/30/126030/2')