diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-07-15 09:57:47 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-15 09:57:47 +0400 |
| commit | 3f2fd36ebcc2ef15df196bd0544cc9c39da57dbf (patch) | |
| tree | 3e94886b0818762f8f2eeb047c5f59801d93fa23 /contrib | |
| parent | a82830a4577dfe93d329918e7624741fee13842c (diff) | |
| parent | b6f3481bb456acbbb990a1045344bb06e5a40283 (diff) | |
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-x | contrib/fast-import/git-p4 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 54a05eb99c..d877150f41 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)): |