Re: What's cooking in git.git (Oct 2009, #03; Mon, 19)

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 19, 2009, 18:58 UTC
Message-ID: <7veioz1a8q.fsf@alter.siamese.dyndns.org>
In-Reply-To: <200910191125.19997.johan@herland.net>

Johan Herland <johan@herland.net> writes:

Show 9 quoted lines

> On Monday 19 October 2009, Junio C Hamano wrote:
>> * jh/notes (2009-10-09) 22 commits.
>>  - fast-import: Proper notes tree manipulation using the notes API
>>  ...
>>  - Introduce commit notes
>>  (this branch uses sr/gfi-options.)
>
> Nope. This branch does not use sr/gfi-options. The jh/cvs-helper branch
> does, though.

We should rebase jh/notes on top of v1.6.5 then.

What you are seeing is a mechanically generated mark that notes that the branch is not forked directly on master but are forked from the commit on the other branch. The parent commit of "Introduce commit notes" is 91d578a (fast-import: test the new option command, 2009-09-06).

Show 10 quoted lines

>> Is this good for 'next' now?
>
> Not all of it.
>
> I suspect the first 14 patches are stable and 'next'-worthy, although
> it would be nice if Dscho had the time to ACK them.
>
> The last patch (#22) needs some major rework based on Shawn's comments
> (I'm working on that, although I currently have less time than I hoped
> for), and that rework might ripple into patches #15 through #21.

Thanks for the status update.