mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
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
This commit is contained in:
commit
3694209ca1
|
@ -560,6 +560,16 @@ in the file. E.g. the string `$Format:%H$` will be replaced by the
|
|||
commit hash.
|
||||
|
||||
|
||||
Packing objects
|
||||
~~~~~~~~~~~~~~~
|
||||
|
||||
`delta`
|
||||
^^^^^^^
|
||||
|
||||
Delta compression will not be attempted for blobs for paths with the
|
||||
attribute `delta` set to false.
|
||||
|
||||
|
||||
Viewing files in GUI tools
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
|
|
4
t/t5100/.gitattributes
vendored
Normal file
4
t/t5100/.gitattributes
vendored
Normal file
|
@ -0,0 +1,4 @@
|
|||
msg* encoding=UTF-8
|
||||
info* encoding=UTF-8
|
||||
rfc2047-info-* encoding=UTF-8
|
||||
sample.mbox encoding=UTF-8
|
35
t/t5100/0010
35
t/t5100/0010
|
@ -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
|
||||
|
Loading…
Reference in a new issue