github章鱼合并差异不匹配分支比较

Question

github 在章鱼合并上显示的差异（https://github.com/ceph/ceph/commit/e54834bfac3c38562987730b317cb1944a96005b ) does not match the diff of the two branches that only differ by this octopus merge ( https://github.com/ceph/ceph/compare/firefly...firefly-backports?expand=1。为什么？

Answer 1

github 上合并提交的差异显示了当前提交与第一个父项之间的差异（或者换句话说，合并应用于已签出的分支）

因此会有这样的差异：https://github.com/ceph/ceph/compare/e539971e2d528b4de6009ea44565f037acb2be66...firefly-backports

github 用 https://github.com/ceph/ceph/compare/firefly...firefly-backports?expand=1 显示的内容 是 git diff firefly...firefly-backports 的输出，其中 by the manual is the diff from the common ancestor of these two branches to the tip of firefly-backports. Since these branches are divergent, The common ancestor of these branches is in fact https://github.com/ceph/ceph/commit/555cc42fc826fd801f0d45187429079d4072d129

所以您在该比较中看到的是从 555cc42 到 firefly-backports 的所有更改。