From: tboegi@web.de
To: peff@peff.net, j6t@kdbg.org, lars.schneider@autodesk.com,
git@vger.kernel.org, gitster@pobox.com, patrick@luehne.de,
larsxschneider@gmail.com
Cc: "Torsten Bögershausen" <tboegi@web.de>
Subject: [PATCH/RFC 0/2] git diff --UTF-8
Date: Fri, 29 Dec 2017 14:28:24 +0100 [thread overview]
Message-ID: <20171229132824.17551-1-tboegi@web.de> (raw)
In-Reply-To: <20171218131249.GB4665@sigill.intra.peff.net>
From: Torsten Bögershausen <tboegi@web.de>
RFC patch: convert files from e.g. UTF-16 into UTF-8 while running
"git diff".
The diff must be called with "git diff --UTF-8" and the "encoding"
attribute must be set for the file(s).
The commit messages may need some improvements, and a closer look
at diff.c, how command line options are forwared, is appreciated.
It may even be possible to integrate t4066 somewhere...
Torsten Bögershausen (2):
convert_to_git(): checksafe becomes an integer
git diff: Allow to reencode into UTF-8
Documentation/diff-options.txt | 4 ++
Documentation/gitattributes.txt | 9 +++++
apply.c | 4 +-
convert.c | 60 +++++++++++++++++++++++-----
convert.h | 20 +++++-----
diff.c | 40 +++++++++++++++++--
diff.h | 1 +
diffcore.h | 3 ++
environment.c | 2 +-
sha1_file.c | 6 +--
t/t4066-diff-encoding.sh | 86 +++++++++++++++++++++++++++++++++++++++++
11 files changed, 205 insertions(+), 30 deletions(-)
create mode 100755 t/t4066-diff-encoding.sh
--
2.15.1.271.g1a4e40aa5d
next prev parent reply other threads:[~2017-12-29 13:28 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-11 15:50 [PATCH v1] convert: add support for 'encoding' attribute lars.schneider
2017-12-11 18:39 ` Eric Sunshine
2017-12-11 23:47 ` Lars Schneider
2017-12-11 23:58 ` Eric Sunshine
2017-12-12 10:58 ` Lars Schneider
2017-12-11 20:47 ` Johannes Sixt
2017-12-11 23:42 ` Lars Schneider
2017-12-12 0:59 ` Junio C Hamano
2017-12-12 7:15 ` Johannes Sixt
2017-12-12 10:55 ` Lars Schneider
2017-12-12 19:31 ` Junio C Hamano
2017-12-13 17:57 ` Lars Schneider
2017-12-13 18:11 ` Junio C Hamano
2017-12-13 23:02 ` Lars Schneider
2017-12-14 23:01 ` Junio C Hamano
2017-12-12 7:09 ` Johannes Sixt
2017-12-18 10:13 ` Torsten Bögershausen
2017-12-18 13:12 ` Jeff King
2017-12-23 8:08 ` Torsten Bögershausen
2017-12-29 13:28 ` tboegi [this message]
2017-12-29 13:28 ` [PATCH/RFC 1/2] convert_to_git(): checksafe becomes an integer tboegi
2017-12-29 13:28 ` [PATCH/RFC 2/2] git diff: Allow to reencode into UTF-8 tboegi
2018-02-26 17:27 ` [PATCH/RFC 1/1] Auto diff of UTF-16 files in UTF-8 tboegi
2018-02-26 18:43 ` Peter Krefting
2018-02-27 22:39 ` Jeff King
2017-12-18 18:02 ` [PATCH v1] convert: add support for 'encoding' attribute Junio C Hamano
2017-12-18 21:55 ` Johannes Sixt
2017-12-15 9:58 ` Jeff King
2017-12-18 10:54 ` Lars Schneider
2017-12-18 12:59 ` Jeff King
2017-12-17 17:14 ` Torsten Bögershausen
2017-12-28 16:14 ` Lars Schneider
2017-12-29 12:59 ` Torsten Bögershausen
2017-12-29 13:56 ` Lars Schneider
2018-01-03 19:15 ` Junio C Hamano
2018-01-03 20:45 ` Lars Schneider
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=20171229132824.17551-1-tboegi@web.de \
--to=tboegi@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=lars.schneider@autodesk.com \
--cc=larsxschneider@gmail.com \
--cc=patrick@luehne.de \
--cc=peff@peff.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).