From: Junio C Hamano <gitster@pobox•com>
To: Kirill Smelkov <kirr@mns•spb.ru>
Cc: git@vger•kernel.org
Subject: Re: [PATCH 00/11] More preparatory work for multiparent tree-walker
Date: Tue, 11 Feb 2014 11:59:02 -0800 [thread overview]
Message-ID: <xmqq61olpgjd.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140211081716.GA4455@tugrik.mns.mnsspb.ru> (Kirill Smelkov's message of "Tue, 11 Feb 2014 12:17:16 +0400")
Kirill Smelkov <kirr@mns•spb.ru> writes:
> Sorry for the confusion. Could you please do the following:
>
> Patches should be applied over to ks/tree-diff-walk
> (74aa4a18). Before applying the patches, please cherry-pick
>
> c90483d9 (tree-diff: no need to manually verify that there is no
> mode change for a path)
>
> ef4f0928 (tree-diff: no need to pass match to
> skip_uninteresting())
>
> into that branch, and drop them from ks/combine-diff - we'll have one
> branch reworking the diff tree-walker, and the other taking advantage of
> it for combine-diff.
As long as that does not lose changes to tests and clean-ups, I'm
fine with that direction. For example, I do not know if you want to
lose e3f62d12 (diffcore-order: export generic ordering interface,
2014-01-20), which is part of the combine-diff topic.
next prev parent reply other threads:[~2014-02-11 19:59 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-07 17:48 [PATCH 00/11] More preparatory work for multiparent tree-walker Kirill Smelkov
2014-02-07 17:48 ` [PATCH 01/11] tree-diff: show_tree() is not needed Kirill Smelkov
2014-02-07 17:48 ` [PATCH 02/11] tree-diff: consolidate code for emitting diffs and recursion in one place Kirill Smelkov
2014-02-13 17:43 ` Junio C Hamano
2014-02-13 17:52 ` Kirill Smelkov
2014-02-07 17:48 ` [PATCH 03/11] tree-diff: don't assume compare_tree_entry() returns -1,0,1 Kirill Smelkov
2014-02-07 17:48 ` [PATCH 04/11] tree-diff: move all action-taking code out of compare_tree_entry() Kirill Smelkov
2014-02-07 17:48 ` [PATCH 05/11] tree-diff: rename compare_tree_entry -> tree_entry_pathcmp Kirill Smelkov
2014-02-07 17:48 ` [PATCH 06/11] tree-diff: show_path prototype is not needed anymore Kirill Smelkov
2014-02-07 17:48 ` [PATCH 07/11] tree-diff: simplify tree_entry_pathcmp Kirill Smelkov
2014-02-07 17:48 ` [PATCH 08/11] tree-diff: remove special-case diff-emitting code for empty-tree cases Kirill Smelkov
2014-02-07 17:48 ` [PATCH 09/11] tree-diff: rework diff_tree interface to be sha1 based Kirill Smelkov
2014-02-07 17:48 ` [PATCH 10/11] tree-diff: no need to call "full" diff_tree_sha1 from show_path() Kirill Smelkov
2014-02-07 17:48 ` [PATCH 11/11] tree-diff: reuse base str(buf) memory on sub-tree recursion Kirill Smelkov
2014-02-13 13:25 ` Kirill Smelkov
2014-02-11 0:28 ` [PATCH 00/11] More preparatory work for multiparent tree-walker Junio C Hamano
2014-02-11 8:17 ` Kirill Smelkov
2014-02-11 19:59 ` Junio C Hamano [this message]
2014-02-12 9:30 ` Kirill Smelkov
2014-02-12 17:25 ` Junio C Hamano
2014-02-13 14:05 ` Kirill Smelkov
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=xmqq61olpgjd.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=kirr@mns$(echo .)spb.ru \
/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