From: Mark Levedahl <mlevedahl@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: rename detection limit checking, cherry picking, and git am -3
Date: Sun, 16 Sep 2007 23:32:31 -0400 [thread overview]
Message-ID: <46EDF54F.5030503@gmail.com> (raw)
Linus' recent patch to invoke limiting on rename detection broke my
ability to use cherry-picking on one project. This project has about
4300 files on one branch (a), 2500 on a later branch (b), 226 commits in
total between the two branches, and a convoluted history of how branch a
morphed into branch b. About 50 files were renamed in the transition,
and we need to migrate patches from the still maintained branch a onto
the new branch b.
Prior to Linus' recent patch to limit rename detection (0024a549),
cherry picking a patch from a to b, where the patch affected just one
file, often took about 45 seconds on a 3 GHz pentium 4 with the CPU
pegged at 100% for the duration. The cherry picking always succeeded and
correctly followed renames, but was very slow.
Following Linus' patch, the cherry picking fails with a merge conflict
(almost instantly), complaining the file has been deleted on b but
modified on a, i.e., the rename detection does not work. I tried raising
diff.renameLimit to 100000, that seems to have no effect whatsoever on
cherry-pick (the process aborts with a conflict almost immediately).
Curiously, using "git format-patch x..y --stdout | git am -3" succeeds
in this case, and runs in well less than a second. This performance
seems unchanged by the rename detection limit patch.
So, the rename limit patch "broke" git for this usage, though one could
reasonably argue the previous code was so slow as to be broken anyway.
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).
Mark
next reply other threads:[~2007-09-17 3:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-17 3:32 Mark Levedahl [this message]
2007-09-17 3:47 ` rename detection limit checking, cherry picking, and git am -3 Shawn O. Pearce
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
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=46EDF54F.5030503@gmail.com \
--to=mlevedahl@gmail.com \
--cc=git@vger.kernel.org \
/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).