mengtiancui@CNNJSX-160009:~$ cat ~/.gitconfig
[url "ssh://[email protected]:29418"]
insteadOf = NJLOCALSERVER
[url "ssh://mengtiancui"]
insteadOf = ssh://njusername
mengtiancui@CNNJSX-160009:~$ ssh -p 29418 -l mengtiancui 10.10.204.22
Permission denied (publickey).(权限被禁)
mengtiancui@CNNJSX-160009:~$ cat ~/.ssh/id_rsa.pub (查看公钥,复制添加到gerrit服务器SSH下)
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiiETOQDMkAjy3EKhoI67ChfcnZxQSsfjxGlOdbju9SsLbgR3CCcQ9fJwZovYtnfHHNgbZlO7UMznoUy3I7Rl7W5oQRQ/y5lyilV4OpEz6Sj0Z5lUyOx1Ao22CXaShY1hJeyw/LLNcxD/dbl5EsFc7yvinxq3hiMWNR8UocBWjjZg4qtxhDnyggfEVIaJSXJ9qpLOWIN+aMhNW8SAX+gRFdbtN+KYNw9pD6DyAalILCvv9ka9VOuAg1YeMfuvk59oNqARn/VQkXJgh9DWQ8RLiszW4zJ9VHpEjke8N3SzH6qotSrxgU+i64SAGJcTZKU774rtPF/KF8OaTys/KLXvd mengtiancui@CNNJSX-160009
mengtiancui@CNNJSX-160009:~$ ssh -p 29418 -l mengtiancui 10.10.204.22(权限依然被禁)
Permission denied (publickey).
mengtiancui@CNNJSX-160009:~$ ssh -p 29418 -l ticy.meng 10.10.204.22(名字是http://10.10.204.22:9999/上username)
**** Welcome to Gerrit Code Review ****
Hi mengtiancui, you have successfully connected over SSH.
Unfortunately, interactive shells are disabled.
To clone a hosted Git repository, use:
git clone ssh://[email protected]:29418/REPOSITORY_NAME.git
Connection to 10.10.204.22 closed.
mengtiancui@CNNJSX-160009:~$ cat ~/.ssh/id_rsa.pub (查看公钥,复制添加到gerrit服务器)
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiiETOQDMkAjy3EKhoI67ChfcnZxQSsfjxGlOdbju9SsLbgR3CCcQ9fJwZovYtnfHHNgbZlO7UMznoUy3I7Rl7W5oQRQ/y5lyilV4OpEz6Sj0Z5lUyOx1Ao22CXaShY1hJeyw/LLNcxD/dbl5EsFc7yvinxq3hiMWNR8UocBWjjZg4qtxhDnyggfEVIaJSXJ9qpLOWIN+aMhNW8SAX+gRFdbtN+KYNw9pD6DyAalILCvv9ka9VOuAg1YeMfuvk59oNqARn/VQkXJgh9DWQ8RLiszW4zJ9VHpEjke8N3SzH6qotSrxgU+i64SAGJcTZKU774rtPF/KF8OaTys/KLXvd mengtiancui@CNNJSX-160009
================================================================================================
mengtiancui@CNNJSX-160009:~$ cat ~/.gitconfig (查看git配置)
[url "ssh://[email protected]:29418"]
insteadOf = NJLOCALSERVER
[url "ssh://mengtiancui"]
insteadOf = ssh://njusername
mengtiancui@CNNJSX-160009:~$ vim ~/.gitconfig(修改gitconfig文本第三行为[url "ssh://ticy.meng"])
mengtiancui@CNNJSX-160009:~$ cd (相当于ls -a .repo是隐藏文件)
.bin/ key/ puck2/ .ssh/
.cache/ mtk8516m3v6/ .repo/ tas2770sw-android-tas2770sw-android/
dirrepo/ puck1022/ .repoconfig/ .vim/
mengtiancui@CNNJSX-160009:~$ cd mtk8516m3v6/(进入该目录才能更新代码,其他目录无法更新)
mengtiancui@CNNJSX-160009:~/mtk8516m3v6$ git config --global user.email "[email protected]"(git配置)
mengtiancui@CNNJSX-160009:~/mtk8516m3v6$ git config --global user.name "ticy.meng"(git配置) mengtiancui@CNNJSX-160009:~/mtk8516m3v6$ git config --global url."ssh://[email protected]:29418".insteadOf "NJLOCALSERVER"(git配置)
mengtiancui@CNNJSX-160009:~/mtk8516m3v6$ repo init --repo-url=ssh://[email protected]:29418/repo --no-repo-verify --repo-branch=master -u ssh://[email protected]:29418/mt8516m3v4/manifest -m mtk8516m3v4.xml(更新代码)
来自 ssh://10.10.204.22:29418/mt8516m3v4/manifest
+ d44fc02...84421cc master -> origin/master (强制更新)
Traceback (most recent call last):
............
IOError: [Errno 2] No such file or directory: '/home/mengtiancui/mtk8516m3v6/.repo/manifest.xml'
mengtiancui@CNNJSX-160009:~/mtk8516m3v6$ ls
build build.log compile_mtk_puck2.sh downloads downloads _beifen meta prebuilt source insight src sstate-cache
mengtiancui@CNNJSX-160009:~/mtk8516m3v6$ rm -rf .repo (强制删除repo,重新建立目录来下载)
mengtiancui@CNNJSX-160009:~/mtk8516m3v6$ repo init --repo-url=ssh://[email protected]:29418/repo --no-repo-verify --repo-branch=master -u ssh://[email protected]:29418/mt8516m3v4/manifest -m mtk8516m3v4.xml
Getting repo ...
from ssh://[email protected]:29418/repo
Unpacking objects: 100% (68/68), done.
来自 ssh://10.10.204.22:29418/mt8516m3v4/manifest
* [新分支] master -> origin/master
Your Name [ticy.meng]:
Your Email [[email protected]]:
Your identity is: ticy.meng <[email protected]>
is this correct [y/n]? y
Testing colorized output (for 'repo diff', 'repo status'):
black red green yellow blue magenta cyan white
bold dim ul reverse
Enable color display in this user account (y/n)? repo^H^H^H^H^H^H^H^H^H^Hy
repo initialized in /home/mengtiancui/mtk8516m3v6
mengtiancui@CNNJSX-160009:~/mtk8516m3v6$ repo sync (代码同步)
Fetching projects: 100% (51/51), done.
Syncing work tree: 82% (42/51) error: Your local changes to the following files would be overwritten by checkout:
arch/arm/boot/dts/mediatek/aud8516m3v4_slc_avs_yocto.dts
arch/arm/configs/aud8516m3v4_slc_avs_yocto_defconfig
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile
sound/soc/mediatek/mt8167/mt8167s-som.c
Please, commit your changes or stash them before you can switch branches.
error: The following untracked working tree files would be overwritten by checkout:
sound/soc/codecs/tas2770-codec.c
sound/soc/codecs/tas2770-codec.h
sound/soc/codecs/tas2770-regmap.c
sound/soc/codecs/tas2770.h
Please move or remove them before you can switch branches.
Aborting
Syncing work tree: 100% (51/51), done.
src/support/assistant-ctrl/alexa/: discarding 10 commits
error: src/kernel/linux/v4.4/: yocto-aud-basic/src/kernel/linux/v4.4 checkout 565fcab2a1d5664bed501b9772c108a862a5ebc1 (已经修改的代码在同步时被检测出来)
重新打开一个会话2进入如下目录,查看状态
mengtiancui@CNNJSX-160009:~/mtk8516m3v6/src/kernel/linux/v4.4$ git status
当前不在任何分支上。
尚未暂存以备提交的变更:
(使用 "git add <file>..." 更新要提交的内容)
(使用 "git checkout -- <file>..." 丢弃工作区的改动)
修改: arch/arm/boot/dts/mediatek/aud8516m3v4_slc_avs_yocto.dts
修改: arch/arm/configs/aud8516m3v4_slc_avs_yocto_defconfig
修改: drivers/Kconfig
修改: sound/soc/codecs/Kconfig
修改: sound/soc/codecs/Makefile
修改: sound/soc/mediatek/mt8167/mt8167s-som.c
未跟踪的文件:
(使用 "git add <file>..." 以包含要提交的内容)
arch/arm/configs/aud8516m3v4_slc_avs_yocto_defconfig.bak
oe-logs
oe-workdir
sound/soc/codecs/tas2770-codec.c
sound/soc/codecs/tas2770-codec.h
sound/soc/codecs/tas2770-regmap.c
sound/soc/codecs/tas2770.h
但您需要小心不要忘了添加新文件(参见 'git help status')。
修改尚未加入提交(使用 "git add" 和/或 "git commit -a")
mengtiancui@CNNJSX-160009:~/mtk8516m3v6/src/kernel/linux/v4.4$ git reset --hard(强制删除待提交的文件)
HEAD 现在位于 941f9c4 Bug Number:bugnone
mengtiancui@CNNJSX-160009:~/mtk8516m3v6/src/kernel/linux/v4.4$ git status (查看状态)
当前不在任何分支上。
未跟踪的文件:
(使用 "git add <file>..." 以包含要提交的内容)
arch/arm/configs/aud8516m3v4_slc_avs_yocto_defconfig.bak
oe-logs
oe-workdir
sound/soc/codecs/tas2770-codec.c
sound/soc/codecs/tas2770-codec.h
sound/soc/codecs/tas2770-regmap.c
sound/soc/codecs/tas2770.h
提交为空,但是存在尚未跟踪的文件(使用 "git add" 建立跟踪)
删除尚未跟踪的文件
mengtiancui@CNNJSX-160009:~/mtk8516m3v6/src/kernel/linux/v4.4$ rm -rf sound/soc/codecs/tas2770-codec.c
mengtiancui@CNNJSX-160009:~/mtk8516m3v6/src/kernel/linux/v4.4$ rm -rf sound/soc/codecs/tas2770-codec.h
mengtiancui@CNNJSX-160009:~/mtk8516m3v6/src/kernel/linux/v4.4$ rm -rf sound/soc/codecs/tas2770-regmap.c
mengtiancui@CNNJSX-160009:~/mtk8516m3v6/src/kernel/linux/v4.4$ rm -rf sound/soc/codecs/tas2770.h
回到会话1,再次执行同步操作
mengtiancui@CNNJSX-160009:~/mtk8516m3v6$ repo sync
Fetching projects: 100% (51/51), done.
mengtiancui@CNNJSX-160009:~/mtk8516m3v6$ repo forall -c scp -p -P 29418 [email protected]:hooks/commit-msg ./.git/hooks/
mengtiancui@CNNJSX-160009:~/mtk8516m3v6$repo forall -c git config core.fileMode false