diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-28 21:50:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-28 21:50:11 (GMT) |
| commit | 2cd900fcf577af2cc5094ba21d1699809649f3bc (patch) | |
| tree | eec92d5e096ee2a2a5ee2352e1c276382552505b /t | |
| parent | d2559f734bba7fe5257720356a92f3b7a5b0d37c (diff) | |
| parent | 17367939ebd64f5e6eb4fa5a32ece513f497e6e6 (diff) | |
| download | git-2cd900fcf577af2cc5094ba21d1699809649f3bc.zip git-2cd900fcf577af2cc5094ba21d1699809649f3bc.tar.gz git-2cd900fcf577af2cc5094ba21d1699809649f3bc.tar.bz2 | |
Merge branch 'maint'
* maint:
Prepare for 1.7.3.5
Fix false positives in t3404 due to SHELL=/bin/false
close file on error in read_mmfile()
Conflicts:
RelNotes
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index d3a3bd2..7d8147b 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -71,8 +71,9 @@ test_expect_success 'setup' ' # "exec" commands are ran with the user shell by default, but this may # be non-POSIX. For example, if SHELL=zsh then ">file" doesn't work # to create a file. Unseting SHELL avoids such non-portable behavior -# in tests. +# in tests. It must be exported for it to take effect where needed. SHELL= +export SHELL test_expect_success 'rebase -i with the exec command' ' git checkout master && |