Sync with 1.6.6.2

diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index 977d6536515e4128a2130a8b5fc911e2c0aafe40..5d9604b8155401a2e345a69a5d030cffd7d16818 100755 (executable)
--- a/t/t3301-notes.sh
+++ b/t/t3301-notes.sh
@@ -192,11 +192,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 &&