Merge branch 'xf/user-manual-markup' into maint

diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh
index 61bc8da56028625fa2525cc5b067d40367f2b1c6..3dc5ec4dd331c152754f3c9480042103d5d9f290 100755 (executable)
--- a/t/t5302-pack-index.sh
+++ b/t/t5302-pack-index.sh
@@ -259,7 +259,7 @@ EOF
     thirtyeight=${tag#??} &&
     rm -f .git/objects/${tag%$thirtyeight}/$thirtyeight &&
     git index-pack --strict tag-test-${pack1}.pack 2>err &&
-    grep "^error:.* expected .tagger. line" err
+    grep "^warning:.* expected .tagger. line" err
 '
 
 test_done