From: "Shawn O. Pearce" <spearce@spearce.org>
To: Mark Levedahl <mlevedahl@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: rename detection limit checking, cherry picking, and git am -3
Date: Sun, 16 Sep 2007 23:47:42 -0400 [thread overview]
Message-ID: <20070917034742.GG3099@spearce.org> (raw)
In-Reply-To: <46EDF54F.5030503@gmail.com>
Mark Levedahl <mlevedahl@gmail.com> wrote:
> The curious thing to me is the vast superiority of whatever
> git-format-patch|git-am -3 does, and I wonder if that isn't a
> fundementally better design for cherry picking than git-cherry-pick
> implements (it obviously is for this case).
In this case `git am -3` creates a tree object containing only
the files modified by the patch and then feeds that tree into
git-merge-recursive. Now if you go study git-revert's code you'll
see it actually just calls git-merge-recursive on three trees,
but these are three complete trees.
So what's probably happening here is there's less candidates on one
side in the `am -3` case, so we spend a lot less time generating
the rename matrix, searching for a match, and we get better changes
of finding a match.
I actually don't see why cherry-pick can't be defined in terms
of `format-patch|am -3`. It probably would be faster in almost
all cases.
--
Shawn.
next prev parent reply other threads:[~2007-09-17 3:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-17 3:32 rename detection limit checking, cherry picking, and git am -3 Mark Levedahl
2007-09-17 3:47 ` Shawn O. Pearce [this message]
2007-09-17 4:27 ` Junio C Hamano
2007-09-17 9:58 ` Karl Hasselström
2007-09-18 0:18 ` Mark Levedahl
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=20070917034742.GG3099@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=mlevedahl@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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.