Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split history imported with git subtree add --squash #15

Open
dxops opened this issue Aug 1, 2016 · 1 comment
Open

Split history imported with git subtree add --squash #15

dxops opened this issue Aug 1, 2016 · 1 comment

Comments

@dxops
Copy link

dxops commented Aug 1, 2016

For now we have monolithic repository with added subtree (~45k commits) repository using squash option, like

Add 'package/' from commit 'hash'
git-subtree-dir: package
git-subtree-mainline: hash
git-subtree-split: hash

Any of --git values creates ~3k commits only

../go/splitsh-lite --prefix=package --target=heads/subtree_go --scratch --progress --git="<1.8.2"
3115 commits created, 97916 commits traversed, in 4.132s
45edc1a3dc374172538b3ed41964cbaedcc19c66

../go/splitsh-lite --prefix=package --target=heads/subtree_go --scratch --progress --git="<2.8.0"
3115 commits created, 97916 commits traversed, in 4.246s
240c137ba401897ef2a7e224af6e05895673dabf

../go/splitsh-lite --prefix=package --target=heads/subtree_go --scratch --progress
3164 commits created, 97916 commits traversed, in 5.313s
c0d65fd26c485144a42fcf073422289a0dba5822

Is it possible to attach created commits to subtree history to be able to push changes back into repository without conflicts and forced push?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants