[PATCH 4/9] diff: discard hunk headers for patch-ids earlier
- From
Jeff King <peff@peff.net>
- Date
- Nov 2, 2018, 06:36 UTC
- Message-ID
- <20181102063636.GD31216@sigill.intra.peff.net>
- In-Reply-To
- <20181102063156.GA30252@sigill.intra.peff.net>
We do not include hunk header lines when computing patch-ids, since the line numbers would create false negatives. Rather than detect and skip them in our line callback, we can simply tell xdiff to avoid generating them.
This is similar to the previous commit, but split out because it actually requires modifying the matching line callback.
Signed-off-by: Jeff King <peff@peff.net> --- diff.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/diff.c b/diff.c index d84356e007..8a83ce6058 100644 --- a/diff.c +++ b/diff.c @@ -5666,10 +5666,6 @@ static void patch_id_consume(void *priv, char *line, unsigned long len) struct patch_id_t *data = priv; int new_len; - /* Ignore line numbers when computing the SHA1 of the patch */ - if (starts_with(line, "@@ -")) - return; - new_len = remove_space(line, len); git_SHA1_Update(data->ctx, line, new_len); @@ -5771,8 +5767,8 @@ static int diff_get_patch_id(struct diff_options *options, struct object_id *oid xpp.flags = 0; xecfg.ctxlen = 3; xecfg.flags = 0; - if (xdi_diff_outf(&mf1, &mf2, NULL, patch_id_consume, - &data, &xpp, &xecfg)) + if (xdi_diff_outf(&mf1, &mf2, discard_hunk_line, + patch_id_consume, &data, &xpp, &xecfg)) return error("unable to generate patch-id diff for %s", p->one->path); }
-- 2.19.1.1336.g081079ac04