Techyou labs
文章RSS
评论RSS
登录
真正的爱应该超越生命的长度,心灵的宽度,灵魂的深度
搜索
关于作者
文章分类
Default
Linux/Unix
Database
Cloud
Networking
Security
Programming
最新文章
openvpn自签名证书
带你重走 TiDB TPS 提升 1000 倍的性能优化之旅
Unicode 中的 BIDI 双向性算法[转]
在linux中设置优先使用ipv4,而不是ipv6
linux下WPS高分辨率下因字体缩放导致字体发虚的问题
ssh-rsa not in pubkeyacceptedalgorithms问题解答及处理办法 Permission denied (publickey)
在 Ubuntu 22.04 中使用 PipeWire 替换 PulseAudio
MYSQL简单监控指标
deepin-wine6-stable下TIM悄悄崩溃问题
openwrt 设置ipv6地址分配
最新评论
renothing: 备注:路由器端优先设置ipv4并不影响客户端的ip...
renothing: 二次反向代理跟你应用程序得处理时间有关系吧?尤其是...
二次反向代理性能很差,怎么优化的?: 我也用nginx 做了个二次反向代理,但是并发连3...
hostyep: 交换链接么?目前每天保持30个左右对口IP,每月都...
yzhkpli: error while loading share...
美肤宝: 感谢分享。。。
lq: 嗯 喜欢弄得点单点
按月归档
August 2023
March 2023
December 2022
November 2022
September 2022
August 2022
March 2022
January 2022
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
February 2021
September 2020
May 2020
September 2019
August 2019
July 2019
June 2019
May 2019
January 2019
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
April 2018
March 2018
December 2017
October 2017
September 2017
August 2017
April 2017
March 2017
February 2017
August 2016
July 2015
November 2014
September 2014
August 2014
July 2014
June 2014
July 2013
April 2013
September 2012
July 2012
May 2012
April 2012
February 2012
January 2012
December 2011
November 2011
October 2011
September 2011
August 2011
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
December 2009
November 2009
October 2009
September 2009
August 2009
June 2009
May 2009
April 2009
March 2009
February 2009
December 2008
November 2008
September 2008
August 2008
July 2008
June 2008
常用标签
Mysql
nginx
mysql优化
linux
debian
Powered by
Typecho)))
Optimized by
EAimTY
Git worktree: 多工作目录
October 13, 2018
日常开发时经常会遇到在稳定分支发hotfix的情况,通常的解决办法是git stash暂存当前工作区内容,再checkout到需要发补丁的分支下工作,完了再切回来。大多数时候这么干没啥问题。不过如果类似node js项目或者其他有大量外部库依赖项目时就麻烦了。比如php或者golang,通常vendor目录都会git ignore。如果刚好工作分支升级了vendor下的依赖库,与即将发补丁的分支依赖库冲突,那就麻烦了,只能clone到别的目录下来做。好在git 2.5已经把这个需求内置实现。这就要介绍今天的主角:git worktree 命令: ``` git worktree add [-f] [--detach] [--checkout] [--lock] [-b
]
[
] git worktree list [--porcelain] git worktree lock [--reason
]
git worktree move
git worktree prune [-n] [-v] [--expire
] git worktree remove [-f]
git worktree unlock
``` 比如当前工作分支下要给已提交的master打补丁,新开工作区到/tmp/nginx ``` renothing@desktop:~/myworks/dockerall/nginx[master]$ git worktree add -b hotfix /tmp/nginx origin/master Branch hotfix set up to track remote branch master from origin. Preparing /tmp/nginx (identifier nginx) HEAD is now at 0041a71 fix proxy header error for upstream ``` 此时查看分支情况如下: ``` renothing@desktop:~/myworks/dockerall/nginx[master]$ git branch -va hotfix 0041a71 fix proxy header error for upstream * master 58eb242 [ahead 1] add enviroment support for multiple sites and fastcgi support remotes/origin/HEAD -> origin/master remotes/origin/master 0041a71 fix proxy header error for upstream ``` 切换到/tmp/nginx下你会发现已经成功开辟新分支并切换到工作区 ``` renothing@desktop:/tmp/nginx[hotfix]$ git branch -va * hotfix 0041a71 fix proxy header error for upstream master 58eb242 [ahead 1] add enviroment support for multiple sites and fastcgi support remotes/origin/HEAD -> origin/master remotes/origin/master 0041a71 fix proxy header error for upstream ``` 此时有两个worktree ``` renothing@desktop:/tmp/nginx[hotfix]$ git worktree list /home/renothing/myworks/dockerall/nginx 58eb242 [master] /tmp/nginx 0041a71 [hotfix] ``` 现在可以在hotfix分支开发补丁并提交,丝毫不影响本地Master分支。提交补丁后,可以回主工作区删除临时worktree ``` renothing@desktop:~/myworks/dockerall/nginx[master]$ git branch -D hotfix Deleted branch hotfix (was 0041a71). renothing@desktop:~/myworks/dockerall/nginx[master]$ git branch -va * master 58eb242 [ahead 1] add enviroment support for multiple sites and fastcgi support remotes/origin/HEAD -> origin/master remotes/origin/master 0041a71 fix proxy header error for upstream renothing@desktop:~/myworks/dockerall/nginx[master]$ rm -rf /tmp/nginx/ renothing@desktop:~/myworks/dockerall/nginx[master]$ git worktree prune renothing@desktop:~/myworks/dockerall/nginx[master]$ git worktree list /home/renothing/myworks/dockerall/nginx 58eb242 [master] ``` 一切干干净净。利用worktree不但能实现真正0干扰多分支开发,还能同时在本地跑测试用于对比两个分支运行情况。
暂无评论
添加新评论
称呼
Email
网站
取消回复
内容
发表评论