Merge branch 'maint-1.6.6' into maint

* maint-1.6.6:
t3301-notes: insert a shbang line in ./fake_editor.sh

diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index 5d9604b8155401a2e345a69a5d030cffd7d16818..714626d2d61ea95465b838595fe9b5e32b8f55b1 100755 (executable)
--- 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