Merge branch 'maint'

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

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