From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, johannes.schindelin@gmx.de,
Elijah Newren <newren@gmail.com>
Subject: [PATCH 4/5] fast-export: differentiate between explicitly utf-8 and implicitly utf-8
Date: Thu, 25 Apr 2019 08:51:17 -0700 [thread overview]
Message-ID: <20190425155118.7918-5-newren@gmail.com> (raw)
In-Reply-To: <20190425155118.7918-1-newren@gmail.com>
The find_encoding() function returned the encoding used by a commit
message, returning a default of git_commit_encoding (usually utf-8).
Although the current code does not differentiate between a commit which
explicitly requested utf-8 and one where we just assume utf-8 because no
encoding is set, it will become important when we try to preserve the
encoding header. Since is_encoding_utf8() returns true when passed
NULL, we can just return NULL from find_encoding() instead of returning
git_commit_encoding.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
builtin/fast-export.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 7734a9f5a5..66331fa401 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -453,7 +453,7 @@ static const char *find_encoding(const char *begin, const char *end)
bol = memmem(begin, end ? end - begin : strlen(begin),
needle, strlen(needle));
if (!bol)
- return git_commit_encoding;
+ return NULL;
bol += strlen(needle);
eol = strchrnul(bol, '\n');
*eol = '\0';
--
2.21.0.779.g2f4b9c5032
next prev parent reply other threads:[~2019-04-25 15:51 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-25 15:51 [PATCH 0/5] Fix and extend encoding handling in fast export/import Elijah Newren
2019-04-25 15:51 ` [PATCH 1/5] t9350: fix encoding test to actually test reencoding Elijah Newren
2019-04-25 17:52 ` Eric Sunshine
2019-04-26 2:40 ` Junio C Hamano
2019-04-25 15:51 ` [PATCH 2/5] fast-import: support 'encoding' commit header Elijah Newren
2019-04-25 19:36 ` Eric Sunshine
2019-04-26 11:39 ` Elijah Newren
2019-04-25 15:51 ` [PATCH 3/5] fast-export: avoid stripping encoding header if we cannot reencode Elijah Newren
2019-04-25 15:51 ` Elijah Newren [this message]
2019-04-25 15:51 ` [PATCH 5/5] fast-export: do automatic reencoding of commit messages only if requested Elijah Newren
2019-04-25 15:55 ` [PATCH 0/5] Fix and extend encoding handling in fast export/import Elijah Newren
2019-04-25 15:57 ` Elijah Newren
2019-04-26 21:32 ` brian m. carlson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190425155118.7918-5-newren@gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.