Merge branch 'master' into next

* master:
  Update draft release notes to 1.7.6
  Start 1.7.5.4 draft release notes
  config.c: Remove unused git_config_global() function
  Documentation: do not misinterpret refspecs as bold text
  format-patch: make zero-length subject prefixes prettier
This commit is contained in:
Junio C Hamano
2011-05-31 12:28:25 -07:00
6 changed files with 54 additions and 19 deletions

View File

@@ -851,4 +851,22 @@ test_expect_success 'subject lines do not have 822 atom-quoting' '
test_cmp expect actual
'
cat >expect <<'EOF'
Subject: [PREFIX 1/1] header with . in it
EOF
test_expect_success 'subject prefixes have space prepended' '
git format-patch -n -1 --stdout --subject-prefix=PREFIX >patch &&
grep ^Subject: patch >actual &&
test_cmp expect actual
'
cat >expect <<'EOF'
Subject: [1/1] header with . in it
EOF
test_expect_success 'empty subject prefix does not have extra space' '
git format-patch -n -1 --stdout --subject-prefix= >patch &&
grep ^Subject: patch >actual &&
test_cmp expect actual
'
test_done