Re: [PATCH v2 1/4] git-p4: Allow setting rename/copy detection threshold.
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 18, 2011, 23:04 UTC
- Message-ID
- <7vy5yq5nkb.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1313706054-11740-2-git-send-email-vitor.hda@gmail.com>
Vitor Antunes <vitor.hda@gmail.com> writes:
Show 25 quoted lines
> Copy and rename detection arguments (-C and -M) allow setting a threshold value
> for the similarity ratio. If the similarity is below this threshold the rename
> or copy is ignored and the file is added as new.
> This patch allows setting git-p4.detectRenames and git-p4.detectCopies options
> to an integer value to set the respective threshold.
>
> Signed-off-by: Vitor Antunes <vitor.hda@gmail.com>
> ---
> contrib/fast-import/git-p4 | 18 +++++++++++++-----
> 1 files changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
> index 6b9de9e..cf719be 100755
> --- a/contrib/fast-import/git-p4
> +++ b/contrib/fast-import/git-p4
> @@ -774,15 +774,23 @@ class P4Submit(Command, P4UserMap):
>
> if not self.detectRenames:
> # If not explicitly set check the config variable
> - self.detectRenames = gitConfig("git-p4.detectRenames").lower() == "true"
> + self.detectRenames = gitConfig("git-p4.detectRenames")
>
> - if self.detectRenames:
> + diffOpts = ""
> + if self.detectRenames.lower() == "true":This is not a new problem you introduced with this patch, but unless you are invoking "git config --bool" in your gitConfig() (I didn't bother to check), you will misunderstand different ways to say "Yes", e.g.
[git-p4]
detectRenames
detectRenames = on
detectRenames = yes
detectRenames = 1If you use --bool, you can rely on the values being either true or false, and do not have to do the .lower() thing.