diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-21 03:13:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-21 03:13:07 -0700 |
| commit | 1be270cbdfd46a34fb8ce39ec31bb593137096fc (patch) | |
| tree | 8a5add1291b6f53d82a36214adbdaefbbeac7881 /t/t5516-fetch-push.sh | |
| parent | c06ee3193e7873fde3525045e88c5741cefc91c4 (diff) | |
| parent | c8b296450e5148c576697ea4709072b7855aacd5 (diff) | |
Merge branch 'maint'
* 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
Diffstat (limited to 't/t5516-fetch-push.sh')
| -rwxr-xr-x | t/t5516-fetch-push.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 2de98e6561..6a37a4d993 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -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 |