summaryrefslogtreecommitdiff
path: root/t/t5100
diff options
context:
space:
mode:
authorAndreas Ericsson <ae@op5.se>2009-06-29 09:55:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-07-08 18:22:51 (GMT)
commit650d30d8a120c8982309ccb9ef40432b4ea2eb74 (patch)
tree4c8f4a6e737d08324649cd049a1a0a5764ef9a3e /t/t5100
parent1bed73c64a354248d6b342e58df257e8233bcbd2 (diff)
downloadgit-650d30d8a120c8982309ccb9ef40432b4ea2eb74.zip
git-650d30d8a120c8982309ccb9ef40432b4ea2eb74.tar.gz
git-650d30d8a120c8982309ccb9ef40432b4ea2eb74.tar.bz2
mailinfo: Remove only one set of square brackets
git-format-patch prepends patches with a [PATCH x/n] prefix, but mailinfo used to remove any number of square-bracket pairs and the content between them. This prevents one from using a commit subject like this: [ and ] must be allowed as input Removing the square bracket pair from this rather clumsily constructed subject line loses important information, so we must take care not to. This patch causes the subject stripping to stop after it has encountered one pair of square brackets. One possible downside of this patch is that the patch-handling programs will now fail at removing author-added square-brackets to be removed, such as [RFC][PATCH x/n] However, since format-patch only adds one set of square brackets, this behaviour is quite easily undesrstood and defended while the previous behaviour is not. Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5100')
-rw-r--r--t/t5100/info00122
-rw-r--r--t/t5100/sample.mbox2
2 files changed, 2 insertions, 2 deletions
diff --git a/t/t5100/info0012 b/t/t5100/info0012
index ac1216f..9cd1415 100644
--- a/t/t5100/info0012
+++ b/t/t5100/info0012
@@ -1,5 +1,5 @@
Author: Dmitriy Blinov
Email: bda@mnsspb.ru
-Subject: Изменён список пакетов необходимых для сборки
+Subject: [Navy-patches] Изменён список пакетов необходимых для сборки
Date: Wed, 12 Nov 2008 17:54:41 +0300
diff --git a/t/t5100/sample.mbox b/t/t5100/sample.mbox
index c5ad206..ba4d0c9 100644
--- a/t/t5100/sample.mbox
+++ b/t/t5100/sample.mbox
@@ -514,7 +514,7 @@ MIME-Version: 1.0
Content-Type: text/plain;
charset=utf-8
Content-Transfer-Encoding: 8bit
-Subject: [Navy-patches] [PATCH]
+Subject: [PATCH] [Navy-patches]
=?utf-8?b?0JjQt9C80LXQvdGR0L0g0YHQv9C40YHQvtC6INC/0LA=?=
=?utf-8?b?0LrQtdGC0L7QsiDQvdC10L7QsdGF0L7QtNC40LzRi9GFINC00LvRjyA=?=
=?utf-8?b?0YHQsdC+0YDQutC4?=