From: tboegi@web.de
To: git@vger.kernel.org
Cc: "Torsten Bögershausen" <tboegi@web.de>
Subject: [PATCH v3 0/3] unified auto CRLF handling, V3
Date: Tue, 28 Jun 2016 10:01:11 +0200 [thread overview]
Message-ID: <1467100871-2686-1-git-send-email-tboegi@web.de> (raw)
In-Reply-To: <xmqq37nyb4kp.fsf@gitster.mtv.corp.google.com>
From: Torsten Bögershausen <tboegi@web.de>
Unified auto CRLF handling, V3
I did the review, some minor changes: against v2:
- SAFE_CRLF_RENORMALIZE is now 3, not 4 so that enum safe_crlf
uses 0..3
- V2 had unintentionally commented out the ident TC, fixed that
What more may be useful to bring this series forward?
Torsten Bögershausen (3):
convert: unify the "auto" handling of CRLF
read-cache: factor out get_sha1_from_index() helper
correct ce_compare_data() in a middle of a merge
Documentation/config.txt | 12 +++----
Documentation/gitattributes.txt | 15 +++++----
builtin/apply.c | 3 +-
builtin/blame.c | 2 +-
cache.h | 4 +++
combine-diff.c | 3 +-
convert.c | 65 +++++++++++++++++++++++-------------
convert.h | 18 +++++++---
diff.c | 3 +-
dir.c | 2 +-
read-cache.c | 33 +++++++++++-------
sha1_file.c | 12 +++++--
t/t0025-crlf-auto.sh | 4 +--
t/t0027-auto-crlf.sh | 29 ++++++++--------
t/t6038-merge-text-auto.sh | 74 ++++++++++++++++++++++++-----------------
15 files changed, 170 insertions(+), 109 deletions(-)
--
2.0.0.rc1.6318.g0c2c796
next prev parent reply other threads:[~2016-06-28 7:53 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-27 23:21 What's cooking in git.git (Jun 2016, #09; Mon, 27) Junio C Hamano
2016-06-28 8:01 ` tboegi [this message]
2016-06-28 8:01 ` [PATCH v3 1/3] convert: unify the "auto" handling of CRLF tboegi
2016-06-28 8:01 ` [PATCH v3 2/3] read-cache: factor out get_sha1_from_index() helper tboegi
2016-06-28 8:01 ` [PATCH v3 3/3] correct ce_compare_data() in a middle of a merge tboegi
2016-06-29 16:14 ` Junio C Hamano
2016-06-30 16:52 ` Torsten Bögershausen
2016-07-01 22:11 ` Junio C Hamano
2016-07-02 18:41 ` Torsten Bögershausen
2016-07-06 14:57 ` Junio C Hamano
2016-07-07 17:16 ` Torsten Bögershausen
2016-07-07 18:43 ` Junio C Hamano
2016-07-07 22:19 ` Junio C Hamano
2016-07-08 7:52 ` Torsten Bögershausen
2016-07-08 16:36 ` Junio C Hamano
2016-07-08 17:13 ` Torsten Bögershausen
2016-07-08 17:25 ` Junio C Hamano
2016-07-08 17:59 ` Junio C Hamano
2016-07-08 19:01 ` Junio C Hamano
2016-07-08 20:50 ` Junio C Hamano
2016-07-11 20:07 ` Junio C Hamano
2016-07-12 2:23 ` Torsten Bögershausen
2016-07-12 19:54 ` Junio C Hamano
2016-07-08 15:00 ` Torsten Bögershausen
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1467100871-2686-1-git-send-email-tboegi@web.de \
--to=tboegi@web.de \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).