Open Blacksmoke16 opened 2 years ago
Looking at using this (again), and still seeing differences in the hashes. The discussion in #26 indicates the differences are nothing to worry about, eventually.
In case it helps with debugging, here is a screenshot showing where things (start to) differ in my testcase. For this I split the 8.2
branch of https://github.com/neos/flow-development-collection into https://github.com/kdambekalns/flow/tree/8.2-splitsh.
At point (1) the branches have the same "root", up to that point they are identical. Point (2) shows the first commits being different in both branches - the "same" PR being merged. In point (3) the PR branch (red) shows a difference, the merge of neos/flow-development-collection#1919 is missing in the splitsh-lite split…
Here is the original history bit:
One merge commit for neos/flow-development-collection#1917 clearly having the merge of neos/flow-development-collection#1919. The latter is actually empty (no code changes), so maybe it got "optimized away"? Or maybe the equivalent of https://github.com/git/git/commit/dd65a9e5e3b6298e4fa52e21680008e7fd5556ea#diff-59f70cbe935ec223e3df413b94cab740 (as mentioned in #26)?
I ran into an issue where the hashes are different between this lib and a standard subtree split. This is causing issues when trying to push the changes to a child repos, while using
git subtree push
works fine.This issue can be reproduced via this script using https://github.com/crystal-manyrepos/two (but also reproduces when using this repo for example):
More details below, but it seems like
splitsh
isn't gathering all the expected commits which results in the hash being different in the end. I'm not using--squash
so I don't think it's related to https://github.com/splitsh/lite/issues/15. I actually also tried with that Docker image in that issue and same problem.Output:
Debug output:
Git log (master):
Git log, branch created via
splitsh
:Git log, branch created via
subtree split
: