We're trying to get git to work well with our vision of submodules,
and have to figure out how to make submodule fetching and pushing work
in a smooth way.
This is our situation (simplified):
[product1] [product2] ... (supermodules)
/ \ / \
... [foo] [os-abstraction-lib] [log-merger] ... (submodules)
A developer does a modification to the os-abstraction-lib, and a
modification to the log-merger that depends on the change in the
os-abstraction-lib. He wants this into product2, and doesn't know or
care about product1. He doesn't know whether his modification is
acceptable or not, or whether his modification will go in before some
other modification.
He needs some way of pushing his modifications to a branch in the
supermodule (e.g. "change-131345"), without interfering with anyone
else. The problem is where to push the sub-modules, they need to be
available for anyone who wants to get the "change-131345" branch of
the product2, but the modifications shouldn't show up anywhere else
(yet). Here are solutions we have thought of so far:
1. push and fetch sha1s directly - this was sort of vetoed on this list.
2. each time you push a submodule, push it to a auto-generated
tag (something like submodule-autogen-<sha1>), and use fetch -t
when fetching the submodules
Issue: Need to clean up these tags at some point, or there will be too
many of them. There will be many ugly tags no matter what.
3. each time you push a submodule, do a merge ours to a
"internal-submodule-tracking" branch, and push to that. Something
like this in other words:
git fetch origin internal-submodule-tracking
git merge -s ours origin/internal-submodule-tracking
git push origin internal-submodule-tracking
git reset --hard HEAD^1
Issue: feels wrong somehow?
4. Manually push all sub-modules to some new branch before pushing the
super-module. This is what we'd rather avoid, but the developer
should obviously have the option of doing this to some sub-modules
if he wants to.
5. Secret option 5 - something we didn't think about
- Finn Arne
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
