summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-05 14:43:45 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-05 14:43:45 -0700
commitbe0dca39e960d67511ca5a75887b903ccae7ccce (patch)
tree3508b7a17ec58dd8b3ad716e07437e535e9d8386 /t
parentUpdate draft release notes to 1.7.6 (diff)
parentt3701: fix here document (diff)
downloadtgif-be0dca39e960d67511ca5a75887b903ccae7ccce.tar.xz
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-xt/t3701-add-interactive.sh5
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' '