From: Michael Haggerty <mhagger@alum•mit.edu>
To: Junio C Hamano <gitster@pobox•com>
Cc: git@vger•kernel.org
Subject: Re: What's cooking in git.git (Jun 2016, #05; Thu, 16)
Date: Sun, 19 Jun 2016 10:15:19 +0200 [thread overview]
Message-ID: <57665497.3060100@alum.mit.edu> (raw)
In-Reply-To: <xmqqziqixsti.fsf@gitster.mtv.corp.google.com>
On 06/18/2016 08:20 PM, Junio C Hamano wrote:
> Michael Haggerty <mhagger@alum•mit.edu> writes:
>
>> On 06/17/2016 05:20 AM, Junio C Hamano wrote:
>>> [...]
>>> * mh/ref-iterators (2016-06-03) 13 commits
>>> (merged to 'next' on 2016-06-06 at c8e79dc)
>>> + ...
>>> (this branch is used by mh/ref-store; uses mh/split-under-lock; is tangled with mh/update-ref-errors.)
>>>
>>> The API to iterate over all the refs (i.e. for_each_ref(), etc.)
>>> has been revamped.
>>>
>>> Will merge to 'master'.
>>
>> It would be preferable (though not critical) to use the promised v3,
>> which I just sent [1]. This includes some minor improvements, described
>> here [2]. This is also available from my GitHub fork [3] as branch
>> "ref-iterators".
>>
>>> * mh/split-under-lock (2016-05-13) 33 commits
>>> (merged to 'next' on 2016-06-03 at 2e71330)
>>> + lock_ref_sha1_basic(): only handle REF_NODEREF mode
>>> + ...
>>> Will merge to 'master'.
>>
>> Please make sure to pick up the important bugfix discussed here [4],
>> which is integrated into branch "split-under-lock" on my GitHub fork [3].
>
> Good timing. I was planning to kick split-under-lock and any of its
> dependents temporarily out of 'next', so that fixes can choose not
> to be incremental, and dependent topics can be rebased on top of the
> fixed fondation. Even if we do incremental, [4] is not sufficient
> material for me to write a log message for.
>
> So people who reviewed what has been in 'next' can revisit [4] and
> give review comments, while I could just pick up the history
> mentioned there, i.e.
>
> git checkout pu
> git pull git://github.com/mhagger/git +split-under-lock:mh/split-under-lock
>
> and we can start from there?
Sure. The branches in my GitHub fork already include all of the
improvements and fixes that I know of, and the only outstanding issue is
the one that Lars mentioned in this thread (which I believe to be a
problem in git-p4).
BTW, there are still no conflicts between these branches
(split-under-lock, update-ref-errors, ref-iterators, and ref-store) and
current master. Therefore, I don't see a need to rebase them onto
master. But if you would prefer that I do so, just let me know.
Michael
next prev parent reply other threads:[~2016-06-19 8:15 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-17 3:20 What's cooking in git.git (Jun 2016, #05; Thu, 16) Junio C Hamano
2016-06-17 13:25 ` Pranit Bauva
2016-06-17 17:55 ` Vasco Almeida
2016-06-17 22:05 ` Lars Schneider
2016-06-17 22:17 ` Junio C Hamano
2016-06-18 17:09 ` Michael Haggerty
2016-06-19 7:59 ` Michael Haggerty
2016-06-19 15:04 ` Lars Schneider
2016-06-19 16:11 ` Lars Schneider
2016-06-19 18:13 ` Junio C Hamano
2016-06-19 18:49 ` Lars Schneider
2016-06-19 18:53 ` Lars Schneider
2016-06-19 18:09 ` Junio C Hamano
2016-06-19 23:51 ` Junio C Hamano
2016-06-20 7:57 ` Lars Schneider
2016-06-23 7:32 ` Michael Haggerty
2016-06-27 7:09 ` Lars Schneider
2016-06-27 16:29 ` Junio C Hamano
2016-06-28 9:23 ` Michael Haggerty
2016-06-28 17:44 ` Junio C Hamano
2016-06-18 4:18 ` Michael Haggerty
2016-06-18 18:20 ` Junio C Hamano
2016-06-19 8:15 ` Michael Haggerty [this message]
2016-06-19 18:07 ` Junio C Hamano
2016-06-20 6:06 ` Torsten Bögershausen
2016-06-20 20:06 ` Junio C Hamano
2016-06-22 21:09 ` Joey Hess
2016-06-23 13:13 ` Torsten Bögershausen
2016-07-12 22:20 ` Joey Hess
2016-07-14 2:09 ` Torsten Bögershausen
2016-07-14 18:17 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=57665497.3060100@alum.mit.edu \
--to=mhagger@alum$(echo .)mit.edu \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox