summaryrefslogtreecommitdiff
path: root/contrib/fast-import/git-p4
diff options
context:
space:
mode:
authorLibravatar Vitor Antunes <vitor.hda@gmail.com>2011-08-22 09:33:09 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-22 11:50:43 -0700
commit68cbcf1b2575ca151ed3b11698916bcbbd1b890c (patch)
treec705e780c1dff520ddcd4170922be6f2d74d536c /contrib/fast-import/git-p4
parentgit-p4: Add test case for copy detection (diff)
downloadtgif-68cbcf1b2575ca151ed3b11698916bcbbd1b890c.tar.xz
git-p4: Process detectCopiesHarder with --bool
Signed-off-by: Vitor Antunes <vitor.hda@gmail.com> Acked-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/fast-import/git-p4')
-rwxr-xr-xcontrib/fast-import/git-p42
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 29a5390fbd..0db3e72665 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -789,7 +789,7 @@ class P4Submit(Command, P4UserMap):
elif detectCopies != "" and detectCopies.lower() != "false":
diffOpts += " -C%s" % detectCopies
- if gitConfig("git-p4.detectCopiesHarder").lower() == "true":
+ if gitConfig("git-p4.detectCopiesHarder", "--bool") == "true":
diffOpts += " --find-copies-harder"
diff = read_pipe_lines("git diff-tree -r %s \"%s^\" \"%s\"" % (diffOpts, id, id))