阿里云服务器建网站网站建设预算知乎
有时某个项目遇到疑难问题，发现早期版本正常，现在的版本异常，而从代码或日志分析异常困难，这时通过二分法夹版本会更加快捷有效，而两个版本的差异提交如何看呢？
- 查看两个版本差异代码文件细节
:~/qcom/hal/mm-camerasdk$ git diff r2s/sm8250/master r2s/sm8250/release --statapi/common/chituningmodeparam.h | 3 +-api/stats/chistatspropertydefines.h | 1 -core/chifeature2/chifeature2base.cpp | 9 +-core/chifeature2/chifeature2base.h | 1 -core/chifeature2/chifeature2requestobject.cpp | 5 +-core/chiframework/chxextensionmodule.h | 6 +-core/chiofflinepostproclib/chiofflinepostprocencode.cpp | 9 +-core/chiusecase/chxadvancedcamerausecase.cpp | 11 +-
- 指定文件的详细差异
~/qcom/hal/mm-camerasdk$ git diff r2s/sm8250/master r2s/sm8250/release api/common/chituningmodeparam.h
diff --git a/api/common/chituningmodeparam.h b/api/common/chituningmodeparam.h
index 1b8476be283..fdb3c6cddda 100755
--- a/api/common/chituningmodeparam.h
+++ b/api/common/chituningmodeparam.h
@@ -43,7 +43,8 @@ enum class ChiModeUsecaseSubModeTypeVideo = 2,ZSL = 3,Liveshot = 4,
- IDEALRAW = 5
+ SnapshotReprocess = 5,
+ IDEALRAW = 6
- git diff r2s/sm8250/master r2s/sm8250/release 则会显示所有文件差异。
- git diff r2s/sm8250/master…r2s/sm8250/release 查看release中比master中多提交了哪些内容，反着写显示效果完全不一样。
:~/qcom/hal/mm-camerasdk$ git diff r2s/sm8250/master..r2s/sm8250/release
diff --git a/api/common/chituningmodeparam.h b/api/common/chituningmodeparam.h
index 1b8476be283..fdb3c6cddda 100755
--- a/api/common/chituningmodeparam.h
+++ b/api/common/chituningmodeparam.h
@@ -43,7 +43,8 @@ enum class ChiModeUsecaseSubModeTypeVideo = 2,ZSL = 3,Liveshot = 4,
- IDEALRAW = 5
+ SnapshotReprocess = 5,
+ IDEALRAW = 6};:~/qcom/hal/mm-camerasdk$ git diff r2s/sm8250/release..r2s/sm8250/master
diff --git a/api/common/chituningmodeparam.h b/api/common/chituningmodeparam.h
index fdb3c6cddda..1b8476be283 100755
--- a/api/common/chituningmodeparam.h
+++ b/api/common/chituningmodeparam.h
@@ -43,8 +43,7 @@ enum class ChiModeUsecaseSubModeTypeVideo = 2,ZSL = 3,Liveshot = 4,
- SnapshotReprocess = 5,
- IDEALRAW = 6
+ IDEALRAW = 5};
- git diff r2s/sm8250/master…r2s/sm8250/release 查看release和master所有差异点
- git log r2s/sm8250/master…r2s/sm8250/release 查看以git log的方式展示差异
- git log -lefg-right r2s/sm8250/release…r2s/sm8250/master 显示提交在哪个分支上。
- git rev-list r2s/sm8250/master…r2s/sm8250/release 查看release中比master中多的提交，只显示commitid，不显示内容。
- 除了gerrit有Change-Id，切了分支也不会变化，但Commit id，切了分支后就变化了，所以对比commitid也无法对比差异。可以git log -1000 > master.txt ，再 git log -1000 > release.txt，然后对比工具对比master.txt和 release.txt发现最下面的都一样，最上面存在合入顺序上的差异，以及差异提交。可以把message里的一行描述grep出来进行对比。也可以把这一行message复制到excel里，出现两次就是都存在的提交，出现1次就是独有的提交。
1:共有的
2：master独有的
3：release独有的