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

Empty subproject commits can't assimilate -> split roundtrip #6

Open
laughinghan opened this issue Jan 4, 2017 · 0 comments
Open

Comments

@laughinghan
Copy link
Owner

To repro:

  1. Add an "upstream" empty commit to the subproject branch
  2. Assimilate subproject branch
  3. Split out the assimilated commits

The empty commit vanishes from the round-trip split out commits. Subsequent commits will all have different hashes. Assimilate needs to detect these and complain. With some statefulness, like a .gitsubhistory folder or something, we could potentially toggle a file in there, though that seems kinda hacky.

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

1 participant