Merge branch 'maint'

diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index 977d6536515e4128a2130a8b5fc911e2c0aafe40..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
@@ -192,11 +193,13 @@ test_expect_success 'git format-patch --show-notes does show notes' '
        grep spam output
 '
 
-for pretty in "" raw short medium full fuller format:%s
+for pretty in \
+       "" --pretty --pretty=raw --pretty=short --pretty=medium \
+       --pretty=full --pretty=fuller --pretty=format:%s --oneline
 do
        case "$pretty" in
        "") p= not= negate="" ;;
-       ?*) p="--pretty=$pretty" not=" not" negate="!" ;;
+       ?*) p="$pretty" not=" not" negate="!" ;;
        esac
        test_expect_success "git show $pretty does$not show notes" '
                git show $p >output &&