summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-02-25 23:21:42 -0800
committerJunio C Hamano <gitster@pobox.com>2010-02-25 23:21:42 -0800
commit64da6e20de1f2246e2d8d9d85e53ca3cbf393212 (patch)
tree008639f6933b670039242a140a2ca659fd37bb37
parent8bb45b25b2230c84724f6f62bfcc04a79999a90c (diff)
parent97a449ee3031e8d128190b7f53a21c7688f73ec9 (diff)
downloadgit-64da6e20de1f2246e2d8d9d85e53ca3cbf393212.tar.gz
Merge branch 'maint-1.6.6' into maint
* maint-1.6.6: t3301-notes: insert a shbang line in ./fake_editor.sh
-rwxr-xr-xt/t3301-notes.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index 5d9604b815..714626d2d6 100755
--- a/t/t3301-notes.sh
+++ b/t/t3301-notes.sh
@@ -8,6 +8,7 @@ test_description='Test commit notes'
. ./test-lib.sh
cat > fake_editor.sh << \EOF
+#!/bin/sh
echo "$MSG" > "$1"
echo "$MSG" >& 2
EOF