您的位置:首页 > 移动开发 > Android开发

git系列------git revert

2016-07-28 14:17 751 查看
   要revert一条提交,其实很简单

首先找提交,比如这个alex的提交

matthew@matthew:/media/matt2/ze550kl-rel-7.27/frameworks/base$ git log --author Alex

commit f022fdcf6aa000b0db78070209e51e2bddbfcc04

Author: Alex Sarraf <asarraf@codeaurora.org>

Date:   Wed Jul 15 11:20:17 2015 -0700

    KeyEvent: Add support for Home key wakeup   

    Add Home key to list of wakeable buttons.   

    Change-Id: Ic452e4bf262301527f83d6dbd9bbaad7aa20a13e

然后

matthew@matthew:/media/matt2/ze550kl-rel-7.27/frameworks/base$ git revert f022fdcf6aa000b0db78070209e51e2bddbfcc04

[detached HEAD c8211a9] Revert "KeyEvent: Add support for Home key wakeup"

 1 file changed, 1 deletion(-)

然后

matthew@matthew:/media/matt2/ze550kl-rel-7.27/frameworks/base$ git_push.sh caf  HEAD:refs/for/rel/ze550kl/asus/6.0.1-22.40.1407

=========================================

 git_push.sh Script V4

=========================================

Arg #1 = caf

Arg #2 = HEAD:refs/for/rel/ze550kl/asus/6.0.1-22.40.1407

execute command: git push ssh://172.29.0.92/8916/platform/frameworks/base HEAD:refs/for/rel/ze550kl/asus/6.0.1-22.40.1407

Counting objects: 13, done.

Delta compression using up to 4 threads.

Compressing objects: 100% (7/7), done.

Writing objects: 100% (7/7), 694 bytes, done.

Total 7 (delta 5), reused 0 (delta 0)

remote: Resolving deltas: 100% (5/5)

remote: Processing changes: refs: 1, done    

remote: ERROR: missing Change-Id in commit message footer

remote: 

remote: Hint: To automatically insert Change-Id, install the hook:

remote:   gitdir=$(git rev-parse --git-dir); scp -p -P 29418 matthew_xuan@172.29.0.92:hooks/commit-msg ${gitdir}/hooks/

remote: And then amend the commit:

remote:   git commit --amend

remote: 

To ssh://172.29.0.92/8916/platform/frameworks/base

 ! [remote rejected] HEAD -> refs/for/rel/ze550kl/asus/6.0.1-22.40.1407 (missing Change-Id in commit message footer)

error: failed to push some refs to 'ssh://172.29.0.92/8916/platform/frameworks/base'

看到失败额,怎么办呢,log已经告诉我们了

matthew@matthew:/media/matt2/ze550kl-rel-7.27/frameworks/base$  gitdir=$(git rev-parse --git-dir); scp -p -P 29418 matthew_xuan@172.29.0.92:hooks/commit-msg ${gitdir}/hooks/

commit-msg                                                                                                                                                                 100% 4494     4.4KB/s   00:00    

matthew@matthew:/media/matt2/ze550kl-rel-7.27/frameworks/base$ git commit --amend

[detached HEAD e8f34f6] Revert "KeyEvent: Add support for Home key wakeup"

 1 file changed, 1 deletion(-)

matthew@matthew:/media/matt2/ze550kl-rel-7.27/frameworks/base$ git_push.sh caf  HEAD:refs/for/rel/ze550kl/asus/6.0.1-22.40.1407

=========================================

 git_push.sh Script V4

=========================================

Arg #1 = caf

Arg #2 = HEAD:refs/for/rel/ze550kl/asus/6.0.1-22.40.1407

execute command: git push ssh://172.29.0.92/8916/platform/frameworks/base HEAD:refs/for/rel/ze550kl/asus/6.0.1-22.40.1407

Counting objects: 13, done.

Delta compression using up to 4 threads.

Compressing objects: 100% (7/7), done.

Writing objects: 100% (7/7), 735 bytes, done.

Total 7 (delta 5), reused 0 (delta 0)

remote: Resolving deltas: 100% (5/5)

remote: Processing changes: new: 1, refs: 1, done    

remote: 

remote: New Changes:

remote:   http://172.29.0.92:8443/37995 Revert "KeyEvent: Add support for Home key wakeup"

remote: 

To ssh://172.29.0.92/8916/platform/frameworks/base

这样就搞定了
内容来自用户分享和网络整理,不保证内容的准确性,如有侵权内容,可联系管理员处理 点击这里给我发消息
标签:  android git