diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-06 01:43:45 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-06 01:43:45 +0400 |
| commit | be0dca39e960d67511ca5a75887b903ccae7ccce (patch) | |
| tree | 3508b7a17ec58dd8b3ad716e07437e535e9d8386 /t | |
| parent | 505a138cbd5c45d890d180383c8bd808ee8105aa (diff) | |
| parent | 8fe6177ac640ca36814ad3394d4e86b4ce8e29e3 (diff) | |
Merge branch 'maint'
* maint:
t3701: fix here document
git-fast-import.txt: --relative-marks takes no parameter
shell: add missing initialization of argv0_path
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3701-add-interactive.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh index d6327e7c74..fdcbe2e736 100755 --- a/t/t3701-add-interactive.sh +++ b/t/t3701-add-interactive.sh @@ -82,10 +82,9 @@ EOF ' test_expect_success PERL 'setup fake editor' ' - cat >fake_editor.sh <<EOF - EOF + >fake_editor.sh && chmod a+x fake_editor.sh && - test_set_editor "$(pwd)/fake_editor.sh" && + test_set_editor "$(pwd)/fake_editor.sh" ' test_expect_success PERL 'dummy edit works' ' |