Merge branch 'maint'

diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 4e7d68dda28a54cdc4f46e11717e113fa8dd479c..9eec754221d85856613b01ec878ef4cb492aceb0 100755 (executable)
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -243,6 +243,8 @@ format-patch --inline --stdout initial..side
 format-patch --inline --stdout initial..master^
 format-patch --inline --stdout initial..master
 format-patch --inline --stdout --subject-prefix=TESTCASE initial..master
+config format.subjectprefix DIFFERENT_PREFIX
+format-patch --inline --stdout initial..master^^
 
 diff --abbrev initial..side
 diff -r initial..side