Re: What's cooking in git.git (Apr 2011, #06; Mon, 25)

From: Jeff King <peff@peff.net>
Date: Apr 26, 2011, 08:13 UTC
Message-ID: <20110426081350.GB26874@sigill.intra.peff.net>
In-Reply-To: <7v39l6hqog.fsf@alter.siamese.dyndns.org>

On Mon, Apr 25, 2011 at 04:11:43PM -0700, Junio C Hamano wrote:

Show 6 quoted lines

> * jk/maint-merge-rename-create (2011-03-25) 3 commits
>  - merge: turn on rewrite detection
>  - merge: handle renames with replacement content
>  - t3030: fix accidental success in symlink rename
> 
> Peff wanted to reroll this, so this is taken out of "next".

Thanks. I have a reproducible bug with this series, but it's with a giant repo, so I'm trying to narrow it down to a smaller test case.

Show 14 quoted lines

> * jk/maint-push-async-hang (2011-03-31) 4 commits
>  - send-pack: abort sideband demuxer on pack-objects error
>  - run-command: allow aborting async code prematurely
>  - finish_async: be quiet when waiting for async process
>  - teach wait_or_whine a "quiet" mode
>  (this branch is used by jk/maint-push-async-hang-threads.)
> 
> * jk/maint-push-async-hang-threads (2011-03-31) 2 commits
>  - run-command: implement abort_async for pthreads
>  - Merge branch 'jk/maint-push-async-hang' into jk/maint-push-async-hang-threads
>  (this branch uses jk/maint-push-async-hang.)
> 
> These two series aim for a good goal, but needs reroll after 1.7.5 with
> sign-offs.

These are redundant with the js/maint-*-send-pack-stateless-rpc-deadlock-fix topics. They aim for a different, more general solution, and it's possible we would want that solution eventually for some other part of the code, but I don't see a need to introduce it now. So I think they can be dropped.

-Peff