From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Michael Haggerty <mhagger@alum.mit.edu>,
Kevin Willford <kewillf@microsoft.com>,
Xiaolong Ye <xiaolong.ye@intel.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Josh Triplett <josh@joshtriplett.org>
Subject: [RFC/PATCH v2 0/3] patch-id for merges
Date: Wed, 7 Sep 2016 18:01:01 -0400 [thread overview]
Message-ID: <20160907220101.hwwutkiagfottbdd@sigill.intra.peff.net> (raw)
In-Reply-To: <20160907075346.z6wtmqnfc6bsunjb@sigill.intra.peff.net>
Here's a re-roll of the series I posted at:
http://public-inbox.org/git/20160907075346.z6wtmqnfc6bsunjb@sigill.intra.peff.net/
Basically, it drops the time for "format-patch --cherry-pick" on a
particular case from 3 minutes down to 3 seconds, by avoiding diffs
on merge commits. Compared to v1, it fixes the totally-broken handling
of commit_patch_id() pointed out by Johannes.
We can drop the diffs on the merge commits because they're quite broken,
as discussed in the commit message of patch 3 (they don't take into
account any parent except the first). So what do we do when somebody
asks for the patch-id of a merge commit?
This is still marked RFC, because there are really two approaches here,
and I'm not sure which one is better for "format-patch --base". I'd like
to get input from Xiaolong Ye (who worked on --base), and Josh Triplett
(who has proposed some patches in that area, and is presumably using
them).
Option one is that merges are defined as having no patch-id at all. They
are skipped for "--cherry-pick" comparison, and "format-patch --base"
will not mention them at all as prerequisites. That's what I've
implemented here.
Option two is to use the commit sha1 as the patch-id for a merge, making
it (essentially) unique. That gives us a defined value, but it's one
that "--cherry-pick" will not match between two segments of history. I
don't know if having _some_ defined value is useful for "format-patch
--base" or not.
And obviously there's an option 3: define some more complicated patch-id
for merges that takes into account all of the parents. I didn't think
too much on that because I don't really see value in it over using the
commit sha1, and it would be computationally expensive.
[1/3]: patch-ids: turn off rename detection
[2/3]: diff_flush_patch_id: stop returning error result
[3/3]: patch-ids: use commit sha1 as patch-id for merge commits
-Peff
next prev parent reply other threads:[~2016-09-07 22:01 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-07 7:53 [RFC/PATCH 0/2] more patch-id speedups Jeff King
2016-09-07 7:54 ` [PATCH 1/2] patch-ids: turn off rename detection Jeff King
2016-09-07 12:53 ` Johannes Schindelin
2016-09-07 7:54 ` [PATCH 2/2] patch-ids: skip merge commits Jeff King
2016-09-07 12:52 ` Johannes Schindelin
2016-09-07 18:46 ` Jeff King
2016-09-07 22:08 ` Jeff King
2016-09-07 13:06 ` [RFC/PATCH 0/2] more patch-id speedups Johannes Schindelin
2016-09-07 18:49 ` Jeff King
2016-09-07 22:01 ` Jeff King [this message]
2016-09-07 22:02 ` [PATCH 1/3] patch-ids: turn off rename detection Jeff King
2016-09-07 22:12 ` Jacob Keller
2016-09-07 22:04 ` [PATCH 2/3] diff_flush_patch_id: stop returning error result Jeff King
2016-09-08 0:51 ` Ramsay Jones
2016-09-08 7:20 ` Jeff King
2016-09-09 10:28 ` Johannes Schindelin
2016-09-09 10:40 ` Jeff King
2016-09-09 12:58 ` Johannes Schindelin
2016-09-09 19:37 ` Jeff King
2016-09-07 22:04 ` [PATCH 3/3] patch-ids: use commit sha1 as patch-id for merge commits Jeff King
2016-09-07 22:28 ` Jacob Keller
2016-09-07 22:38 ` Jeff King
2016-09-07 22:51 ` [RFC/PATCH v2 0/3] patch-id for merges Josh Triplett
2016-09-08 7:30 ` Jeff King
2016-09-09 20:34 ` [PATCH v3 0/2] " Jeff King
2016-09-09 20:34 ` [PATCH v3 1/2] patch-ids: turn off rename detection Jeff King
2016-09-09 20:34 ` [PATCH v3 2/2] patch-ids: define patch-id of merge commits as "null" Jeff King
2016-09-09 20:37 ` Jeff King
2016-09-09 21:13 ` Junio C Hamano
2016-09-09 21:01 ` [PATCH v3 0/2] patch-id for merges Junio C Hamano
2016-09-12 15:59 ` Jeff King
2016-09-12 17:18 ` Junio C Hamano
2016-09-12 17:56 ` Jeff King
2016-09-12 20:44 ` Junio C Hamano
2016-09-25 18:25 ` Johannes Schindelin
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=20160907220101.hwwutkiagfottbdd@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=josh@joshtriplett.org \
--cc=kewillf@microsoft.com \
--cc=mhagger@alum.mit.edu \
--cc=xiaolong.ye@intel.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).