Junio C Hamano <gits...@pobox.com> writes:
> Care to turn it into an appliable patch with tests?
In the meantime, here is a quick-and-dirty one. I am not proud of
it; it was just something to keep in 'pu' let it gets lost.
A better replacement is very much welcomed.
-- >8 --
Subject: [PATCH] diff: demote core.safecrlf=true to core.safecrlf=warn
Otherwise the user will not be able to start to guess where in the
contents in the working tree the offending unsafe CR lies.
Signed-off-by: Junio C Hamano <gits...@pobox.com>
---
diff.c | 6 +++++-
t/t0020-crlf.sh | 8 ++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/diff.c b/diff.c
index 32142db..155857c 100644
--- a/diff.c
+++ b/diff.c
@@ -2647,6 +2647,10 @@ static int diff_populate_gitlink(struct diff_filespec
*s, int size_only)
int diff_populate_filespec(struct diff_filespec *s, int size_only)
{
int err = 0;
+ enum safe_crlf crlf_warn = (safe_crlf != SAFE_CRLF_FAIL
+ ? safe_crlf
+ : SAFE_CRLF_WARN);
+
if (!DIFF_FILE_VALID(s))
die("internal error: asking to populate invalid file.");
if (S_ISDIR(s->mode))
@@ -2702,7 +2706,7 @@ int diff_populate_filespec(struct diff_filespec *s, int
size_only)
/*
* Convert from working tree format to canonical git format
*/
- if (convert_to_git(s->path, s->data, s->size, &buf, safe_crlf))
{
+ if (convert_to_git(s->path, s->data, s->size, &buf, crlf_warn))
{
size_t size = 0;
munmap(s->data, s->size);
s->should_munmap = 0;
diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh
index 1a8f44c..e526184 100755
--- a/t/t0020-crlf.sh
+++ b/t/t0020-crlf.sh
@@ -81,6 +81,14 @@ test_expect_success 'safecrlf: print warning only once' '
test $(git add doublewarn 2>&1 | grep "CRLF will be replaced by LF" |
wc -l) = 1
'
+
+test_expect_success 'safecrlf: git diff demotes safecrlf=true to warn' '
+ git config core.autocrlf input &&
+ git config core.safecrlf true &&
+ git diff HEAD
+'
+
+
test_expect_success 'switch off autocrlf, safecrlf, reset HEAD' '
git config core.autocrlf false &&
git config core.safecrlf false &&
--
1.8.3.1-771-gb7c3f25
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
