Re: RFC/RFH submodule handling in big setups

From: Jan Hudec <bulb@ucw.cz>
Date: Jan 7, 2008, 20:07 UTC
Message-ID: <20080107200756.GA20892@efreet.light.src>
In-Reply-To: <20080107102327.GA12427@pvv.org>

On Mon, Jan 07, 2008 at 11:23:27 +0100, Finn Arne Gangstad wrote:

Show 10 quoted lines

> 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?

Only one thing feels wrong here -- the merge -s ours. For one thing, the commit is probably descendant of what was in the internal-submodule-tracking branch (the branch name should actually have product2 in it's name). If it is not, you should not artificially make it so, but rewind the branch.

But as Junio already told you, you should really manage the subproject like a project (because it is a project), so the change should get to a topic branch where the other superprojects can look at the change and decide whether they want it or not.

-- 
						 Jan 'Bulb' Hudec <bulb@ucw.cz>