aboutsummaryrefslogtreecommitdiff
path: root/t/t5100/patch0017
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-17 14:17:58 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-17 15:24:52 -0700
commit176943b9658b1fa9ae3972156100d831d19c3576 (patch)
tree19b39b2c585260ef38740ba3b2f4c9d78d5cc777 /t/t5100/patch0017
parent785ee4960c3d334cbc2b17ab74d2cebdf1b4db64 (diff)
downloadgit-176943b9658b1fa9ae3972156100d831d19c3576.tar.gz
git-176943b9658b1fa9ae3972156100d831d19c3576.tar.xz
mailinfo: do not concatenate charset= attribute values from mime headers
"Content-type: text/plain; charset=UTF-8" header should not appear twice in the input, but it is always better to gracefully deal with such a case. The current code concatenates the value to the values we have seen previously, producing nonsense such as "utf8UTF-8". Instead of concatenating, forget the previous value and use the last value we see. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5100/patch0017')
-rw-r--r--t/t5100/patch00176
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t5100/patch0017 b/t/t5100/patch0017
new file mode 100644
index 000000000..35cf84c9a
--- /dev/null
+++ b/t/t5100/patch0017
@@ -0,0 +1,6 @@
+diff --git a/foo b/foo
+index e69de29..d95f3ad 100644
+--- a/foo
++++ b/foo
+@@ -0,0 +1 @@
++New content