Using Git to Manage Aegir and Custom Module

We have written a custom Aegir module and are interested in maintaining it in Git.

I am trying to figure out the best way to do this:

[1] Should we have only the module's code in git and pull from that every time after we update Aegir?

Pros: Maintain one component, and rely on the Aegir site for Aegir updates Cons: Updating Aegir might (will?) wipe out custom module

... or ...

[2] Should we put the contents of the hostmaster-6.x-1.x directory (with the module) into the repo along with the module's code?

Pros: All of Aegir is in one place as a package Cons: We have to update the repo with Aegir every time there is an update Cons(?): We have three instances of Aegir (Dev, Test, Live) with three different sites

Dev: /var/aegir/hostmaster-6.x-1.6/sites/dev_host Test: /var/aegir/hostmaster-6.x-1.6/sites/test_host Live: /var/aegir/hostmaster-6.x-1.6/sites/live_host

which we will have to exclude in the git repo ... ?

Any ideas on how to best approach this?

Many thanks!