summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-07-15 05:57:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-07-15 05:57:47 (GMT)
commit3f2fd36ebcc2ef15df196bd0544cc9c39da57dbf (patch)
tree3e94886b0818762f8f2eeb047c5f59801d93fa23 /contrib
parenta82830a4577dfe93d329918e7624741fee13842c (diff)
parentb6f3481bb456acbbb990a1045344bb06e5a40283 (diff)
downloadgit-3f2fd36ebcc2ef15df196bd0544cc9c39da57dbf.zip
git-3f2fd36ebcc2ef15df196bd0544cc9c39da57dbf.tar.gz
git-3f2fd36ebcc2ef15df196bd0544cc9c39da57dbf.tar.bz2
Merge branch 'master' of git://repo.or.cz/git/fastimport
* 'master' of git://repo.or.cz/git/fastimport: Teach fast-import to recursively copy files/directories Fix git-p4 on Windows to not use the Posix sysconf function. Correct trivial typo in fast-import documentation
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/fast-import/git-p46
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 54a05eb..d877150 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -717,7 +717,11 @@ class P4Sync(Command):
# POSIX says it's 4096 bytes, default for Linux seems to be 130 K.
# and all OS from the table below seems to be higher than POSIX.
# See http://www.in-ulm.de/~mascheck/various/argmax/
- argmax = min(4000, os.sysconf('SC_ARG_MAX'))
+ if (self.isWindows):
+ argmax = 2000
+ else:
+ argmax = min(4000, os.sysconf('SC_ARG_MAX'))
+
chunk = ''
filedata = []
for i in xrange(len(files)):