diff options
author | Jeff King <peff@peff.net> | 2016-09-09 16:34:34 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-09-09 14:13:53 -0700 |
commit | 5a29cbc6e9c5f7d28228f4f389a122ca074a9c08 (patch) | |
tree | d49573deea0f9582988d049f30de875b43ce619a /convert.c | |
parent | Git 2.10 (diff) | |
download | tgif-5a29cbc6e9c5f7d28228f4f389a122ca074a9c08.tar.xz |
patch-ids: turn off rename detection
The patch-id code may be running inside another porcelain
like "git log" or "git format-patch", and therefore may have
set diff_detect_rename_default, either via the diff-ui
config, or by default since 5404c11 (diff: activate
diff.renames by default, 2016-02-25). This is the case even
if a command is run with `--no-renames`, as that is applied
only to the diff-options used by the command itself.
Rename detection doesn't help the patch-id results. It
_may_ actually hurt, as minor differences in the files that
would be overlooked by patch-id's canonicalization might
result in different renames (though I'd doubt that it ever
comes up in practice).
But mostly it is just a waste of CPU to compute these
renames.
Note that this does have one user-visible impact: the
prerequisite patches listed by "format-patch --base". There
may be some confusion between different versions of git as
older ones will enable renames, but newer ones will not.
However, this was already a problem, as people with
different settings for the "diff.renames" config would get
different results. After this patch, everyone should get the
same results, regardless of their config.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'convert.c')
0 files changed, 0 insertions, 0 deletions