diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-10-13 20:20:09 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-10-13 20:20:09 -0700 |
commit | 38a18873b21f6f2eebedc65aff2249fd6ec2168c (patch) | |
tree | 5f7d8cce901a2317a8fbdef7bce2fb85742be1fc /t/t556x_common | |
parent | fast-import: Allow filemodify to set the root (diff) | |
parent | Better advice on using topic branches for kernel development (diff) | |
download | tgif-38a18873b21f6f2eebedc65aff2249fd6ec2168c.tar.xz |
Merge branch 'maint'
* maint:
Better advice on using topic branches for kernel development
Documentation: update implicit "--no-index" behavior in "git diff"
Documentation: expand 'git diff' SEE ALSO section
Documentation: diff can compare blobs
Documentation: gitrevisions is in section 7
shell portability: no "export VAR=VAL"
CodingGuidelines: reword parameter expansion section
Documentation: update-index: -z applies also to --index-info
Documentation: No argument of ALLOC_GROW should have side-effects
Diffstat (limited to 't/t556x_common')
-rwxr-xr-x | t/t556x_common | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t556x_common b/t/t556x_common index be024e551c..51287d89d8 100755 --- a/t/t556x_common +++ b/t/t556x_common @@ -50,7 +50,7 @@ get_static_files() { } SMART=smart -export GIT_HTTP_EXPORT_ALL=1 +GIT_HTTP_EXPORT_ALL=1 && export GIT_HTTP_EXPORT_ALL test_expect_success 'direct refs/heads/master not found' ' log_div "refs/heads/master" GET refs/heads/master "404 Not Found" @@ -73,7 +73,7 @@ test_expect_success 'export if git-daemon-export-ok' ' get_static_files "200 OK" ' SMART=smart -export GIT_HTTP_EXPORT_ALL=1 +GIT_HTTP_EXPORT_ALL=1 && export GIT_HTTP_EXPORT_ALL test_expect_success 'static file if http.getanyfile true is ok' ' log_div "getanyfile true" config http.getanyfile true && |