From: Jeff King <peff@peff.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org, Michael Haggerty <mhagger@alum.mit.edu>,
Kevin Willford <kewillf@microsoft.com>
Subject: Re: [PATCH 2/2] patch-ids: skip merge commits
Date: Wed, 7 Sep 2016 18:08:03 -0400 [thread overview]
Message-ID: <20160907220803.3cvjkchpmyff7h5f@sigill.intra.peff.net> (raw)
In-Reply-To: <20160907184653.ed5c4oklyywjj2gp@sigill.intra.peff.net>
On Wed, Sep 07, 2016 at 02:46:53PM -0400, Jeff King wrote:
> > With this change, commit_patch_id() will return 0 for merge commits
> > (indicating success) but it will not have touched the sha1! Which means it
> > may very well have all kinds of crap in the sha1 that may, or may not,
> > match another, real patch ID randomly.
>
> Eek, thanks. Somehow I got it into my head that diff_flush_patch_id()
> below was what added it to the list, but clearly that is not the case.
> Looking at it again, I can't imagine how that is the case.
Ah, I see. I initially was looking at an older git (v2.6.x), in which
commit_patch_id() is a static function inside patch-ids.c, and we do not
do any lazy-load trickery. But note that the patch is still wrong even
there; it should return "-1" from commit_patch_id() to instruct the
caller not to add it to the hash.
Anyway...
> > I would suggest to simply copy the merge commit's SHA-1. It is no patch
> > ID, of course, but collisions are as unlikely as commit name collisions,
> > and it would make the "patch ID" of a merge commit deterministic again.
>
> I agree that would work, though it does mean carrying extra useless
> entries in the patch_id hash. I'll see how bad it would be to simply
> omit them entirely, but this seems like a good fallback plan.
It's not too hard to do so, but it raises a question of what
"format-patch --base" would want. I've just sent another RFC cc-ing
folks interested in that area.
Thanks again for the review.
-Peff
next prev parent reply other threads:[~2016-09-07 22:08 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 [this message]
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 ` [RFC/PATCH v2 0/3] patch-id for merges Jeff King
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=20160907220803.3cvjkchpmyff7h5f@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=kewillf@microsoft.com \
--cc=mhagger@alum.mit.edu \
/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).