mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  Fix checkout of large files to network shares on Windows XP
  start_command: close cmd->err descriptor when fork/spawn fails
  Fix "Out of memory? mmap failed" for files larger than 4GB on Windows
This commit is contained in:
Junio C Hamano
2010-05-21 03:13:07 -07:00
parent c06ee3193e c8b296450e
commit 1be270cbdf
6 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/t5516-fetch-push.sh
View File

@ -528,7 +528,7 @@ test_expect_success 'push does not update local refs on failure' '
mk_test heads/master &&
mk_child child &&
mkdir testrepo/.git/hooks &&
echo exit 1 >testrepo/.git/hooks/pre-receive &&
echo "#!/no/frobnication/today" >testrepo/.git/hooks/pre-receive &&
chmod +x testrepo/.git/hooks/pre-receive &&
(cd child &&
git pull .. master

12
t/t5705-clone-2gb.sh
View File

@ -12,7 +12,7 @@ test_expect_success 'setup' '
git config pack.compression 0 &&
git config pack.depth 0 &&
blobsize=$((20*1024*1024)) &&
blobsize=$((100*1024*1024)) &&
blobcount=$((2*1024*1024*1024/$blobsize+1)) &&
i=1 &&
(while test $i -le $blobcount
@ -36,9 +36,15 @@ test_expect_success 'setup' '
'
test_expect_success 'clone' '
test_expect_success 'clone - bare' '
git clone --bare --no-hardlinks . clone
git clone --bare --no-hardlinks . clone-bare
'
test_expect_success 'clone - with worktree, file:// protocol' '
git clone file://. clone-wt
'