diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-10-21 17:33:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-21 17:33:15 -0700 |
| commit | 3694209ca16c033fb4c539cc23b0b370e48952dd (patch) | |
| tree | fdabce5e6ed086ae3de8e1adda98eb7efafeeba8 /t | |
| parent | 8e850a4dbdcda5e7be8367d81fef3f70da0e8294 (diff) | |
| parent | 975457f185acd7c1f96ccff67cd5dc8dcb7908a0 (diff) | |
| download | git-3694209ca16c033fb4c539cc23b0b370e48952dd.tar.gz git-3694209ca16c033fb4c539cc23b0b370e48952dd.tar.xz | |
Merge branch 'maint'
* maint:
Document `delta` attribute in "git help attributes".
Mark files in t/t5100 as UTF-8
Remove a left-over file from t/t5100
Diffstat (limited to 't')
| -rw-r--r-- | t/t5100/.gitattributes | 4 | ||||
| -rw-r--r-- | t/t5100/0010 | 35 |
2 files changed, 4 insertions, 35 deletions
diff --git a/t/t5100/.gitattributes b/t/t5100/.gitattributes new file mode 100644 index 000000000..c93f5142f --- /dev/null +++ b/t/t5100/.gitattributes @@ -0,0 +1,4 @@ +msg* encoding=UTF-8 +info* encoding=UTF-8 +rfc2047-info-* encoding=UTF-8 +sample.mbox encoding=UTF-8 diff --git a/t/t5100/0010 b/t/t5100/0010 deleted file mode 100644 index f5892c9da..000000000 --- a/t/t5100/0010 +++ /dev/null @@ -1,35 +0,0 @@ -From b9704a518e21158433baa2cc2d591fea687967f6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lukas=20Sandstr=C3=B6m?= <lukass@etek.chalmers.se> -Date: Thu, 10 Jul 2008 23:41:33 +0200 -Subject: Re: discussion that lead to this patch -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -[PATCH] git-mailinfo: Fix getting the subject from the body - -"Subject: " isn't in the static array "header", and thus -memcmp("Subject: ", header[i], 7) will never match. - -Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> -Signed-off-by: Junio C Hamano <gitster@pobox.com> ---- - builtin-mailinfo.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c -index 962aa34..2d1520f 100644 ---- a/builtin-mailinfo.c -+++ b/builtin-mailinfo.c -@@ -334,7 +334,7 @@ static int check_header(char *line, unsigned linesize, char **hdr_data, int over - return 1; - if (!memcmp("[PATCH]", line, 7) && isspace(line[7])) { - for (i = 0; header[i]; i++) { -- if (!memcmp("Subject: ", header[i], 9)) { -+ if (!memcmp("Subject", header[i], 7)) { - if (! handle_header(line, hdr_data[i], 0)) { - return 1; - } --- -1.5.6.2.455.g1efb2 - |