Skip to content

Commit

Permalink
git: fix no-copies option
Browse files Browse the repository at this point in the history
This reverts commit 9103513.

I originally added --no-find-copies in e688357
to suppress git being too clever which ends up confusing our git integration, as
we're not really interested in copies. I was going to use --no-find-copies-harder
but I figured --no-find-copies sounded better as it was less specific and for
our purposes here, we don't want copies at all, so why not?

But --no-find-copies isn't a boolean option, it's just that until git commit
5825268db1058516d05be03d6a8d8d55eea5a943 ('parse-options: fully disable option abbreviation with PARSE_OPT_KEEP_UNKNOWN'),
it tolerated it and expanded it to --no-find-copies-harder. Oops!

Let's use --no-find-copies-harder as we originally should have, as the only
available option to control the behavior, modulo setting a similarity % threshold
with --find-copies=n.

We're fine to do this as, quoting the git-log docs:
"[...] and options applicable to the git-diff[1] command to control how the changes each commit introduces are shown."

Bug: https://bugs.gentoo.org/924718
Bug: #663
Signed-off-by: Sam James <[email protected]>
  • Loading branch information
thesamesam committed Feb 16, 2024
1 parent 9103513 commit cf38a14
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/pkgcheck/addons/git.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,7 @@ def __init__(self, path, commit_range):
cmd = shlex.split(self._git_cmd)
cmd.append(f"--pretty=tformat:%n{'%n'.join(self._format)}")
cmd.append(commit_range)
# https://bugs.gentoo.org/924718
# cmd.extend(("--no-find-copies", "--no-find-copies-harder", "--find-renames"))
cmd.extend(("--no-find-copies-harder", "--find-renames"))

self.git_log = GitLog(cmd, self.path)
# discard the initial newline
Expand Down

0 comments on commit cf38a14

Please sign in to comment.