Re: What's cooking in git.git (Oct 2011, #03; Fri, 7)

From: Heiko Voigt <hvoigt@hvoigt.net>
Date: Oct 10, 2011, 20:16 UTC
Message-ID: <20111010201629.GB5981@sandbox-rc>
In-Reply-To: <7vsjn4tukt.fsf@alter.siamese.dyndns.org>

Hi Junio,

sorry for the late reply I was taking some time off from email. Here now some information on the two topics I am involved with that got stalled:

On Fri, Oct 07, 2011 at 01:28:34PM -0700, Junio C Hamano wrote:

Show 7 quoted lines

> --------------------------------------------------
> [Stalled]
> 
> * hv/submodule-merge-search (2011-08-26) 5 commits
>  - submodule: Search for merges only at end of recursive merge
>  - allow multiple calls to submodule merge search for the same path
>  - submodule: Demonstrate known breakage during recursive merge

The three patches above belong to the merge-search fix topic. I think they should be good to go.

>  - push: Don't push a repository with unpushed submodules
>  - push: teach --recurse-submodules the on-demand option
>  (this branch is tangled with fg/submodule-auto-push.)

These two belong into the fg/submodule-auto-push topic. It seems they got mixed into this while dicussing the two topics.

> The second from the bottom one needs to be replaced with a properly
> written commit log message.

I will look into that.

Show 7 quoted lines

> * fg/submodule-auto-push (2011-09-11) 2 commits
>  - submodule.c: make two functions static
>  - push: teach --recurse-submodules the on-demand option
>  (this branch is tangled with hv/submodule-merge-search.)
> 
> What the topic aims to achieve may make sense, but the implementation
> looked somewhat suboptimal.

We will also have a look at the final cleanups we need here. (Fredrik?)

Cheers Heiko