From: Jonathan Tan <jonathantanmy@google.com>
To: newren@gmail.com
Cc: gitster@pobox.com, git@vger.kernel.org,
Jonathan Tan <jonathantanmy@google.com>
Subject: Re: What's cooking in git.git (Dec 2020, #01; Tue, 8)
Date: Wed, 9 Dec 2020 18:57:22 -0800 [thread overview]
Message-ID: <20201210025722.1645961-1-jonathantanmy@google.com> (raw)
In-Reply-To: <CABPp-BGcyRURykePOafjcE1z9J8U5awF=PZw1ufx+8Ow+k3j3w@mail.gmail.com>
> > * en/merge-ort-impl (2020-12-06) 21 commits
> > - merge-ort: free data structures in merge_finalize()
> > - merge-ort: add implementation of record_conflicted_index_entries()
> > - tree: enable cmp_cache_name_compare() to be used elsewhere
> > - merge-ort: add implementation of checkout()
> > - merge-ort: basic outline for merge_switch_to_result()
> > - merge-ort: step 3 of tree writing -- handling subdirectories as we go
> > - merge-ort: step 2 of tree writing -- function to create tree object
> > - merge-ort: step 1 of tree writing -- record basenames, modes, and oids
> > - merge-ort: have process_entries operate in a defined order
> > - merge-ort: add a preliminary simple process_entries() implementation
> > - merge-ort: avoid recursing into identical trees
> > - merge-ort: record stage and auxiliary info for every path
> > - merge-ort: compute a few more useful fields for collect_merge_info
> > - merge-ort: avoid repeating fill_tree_descriptor() on the same tree
> > - merge-ort: implement a very basic collect_merge_info()
> > - merge-ort: add an err() function similar to one from merge-recursive
> > - merge-ort: use histogram diff
> > - merge-ort: port merge_start() from merge-recursive
> > - merge-ort: add some high-level algorithm structure
> > - merge-ort: setup basic internal data structures
> > - Merge branch 'en/strmap' into en/merge-ort-impl
> > (this branch is used by en/merge-ort-2.)
> >
> > Needs review.
>
> I think I've addressed all the feedback in v4 (which is sadly labelled
> as v2 due to switching from send-email to gitgitgadget part way
> through the series). If there's more review needed, I'd say getting a
> thumbs-up or thumbs-down from Stolee and Jonathan on whether I
> addressed their feedback adequately would be great, and having someone
> give a look over the 2nd-to-last and 4th-to-last patches would always
> be a plus. Was that what you had in mind in marking this as "Needs
> review"?
Rereading my feedback and the parts of the v4 patch set that correspond
to my feedback, my comments (which were more about clarity anyway - I
didn't notice any correctness or performance issues) have been addressed
adequately. But to be fully sure, I would need to reread the patches to
ensure that nothing unexpected was introduced. :-P (If nobody does this,
I can do this - hopefully by the end of the week.)
I wonder if it would be worth splitting this branch into the first 15
patches (which I reviewed, and which has more of an algorithmic focus)
and the last 5 patches (which I didn't review, and which has more of an
integration-into-Git focus). That way, the last 5 wouldn't hold up the
first 15.
next prev parent reply other threads:[~2020-12-10 2:58 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-09 1:31 What's cooking in git.git (Dec 2020, #01; Tue, 8) Junio C Hamano
2020-12-09 1:41 ` Taylor Blau
2020-12-10 2:02 ` Jonathan Tan
2020-12-09 2:45 ` Elijah Newren
2020-12-09 4:22 ` Junio C Hamano
2020-12-09 23:02 ` Taylor Blau
2020-12-10 0:57 ` Junio C Hamano
2020-12-10 2:57 ` Jonathan Tan [this message]
2020-12-09 14:09 ` fc/pull-merge-rebase, was " Johannes Schindelin
2020-12-09 21:28 ` Junio C Hamano
2020-12-10 0:31 ` Felipe Contreras
2020-12-10 4:40 ` Johannes Schindelin
2020-12-10 4:46 ` Johannes Schindelin
2020-12-10 15:11 ` Felipe Contreras
2020-12-10 15:27 ` Theodore Y. Ts'o
2020-12-10 18:28 ` Junio C Hamano
2020-12-11 1:33 ` Felipe Contreras
2020-12-11 7:17 ` Junio C Hamano
2020-12-11 14:10 ` Felipe Contreras
2020-12-11 22:09 ` Theodore Y. Ts'o
2020-12-12 0:43 ` Felipe Contreras
2020-12-10 0:27 ` Felipe Contreras
2020-12-11 5:59 ` Junio C Hamano
2020-12-09 14:11 ` js/init-defaultbranch-advice, " Johannes Schindelin
2020-12-09 21:57 ` Junio C Hamano
2020-12-10 4:54 ` Johannes Schindelin
2020-12-10 18:33 ` Junio C Hamano
2020-12-11 0:03 ` Felipe Contreras
2020-12-10 3:56 ` bc/rev-parse-path-format, " Johannes Schindelin
2020-12-10 18:34 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201210025722.1645961-1-jonathantanmy@google.com \
--to=jonathantanmy@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).