Re: Why doesn't git core.eol=lf work?

From: Johannes Sixt <j6t@kdbg.org>
Date: Jul 12, 2025, 13:35 UTC
Message-ID: <23f2bbea-1294-4773-89d8-b270e2c3bb52@kdbg.org>
In-Reply-To: <QcbAE4JJXpU-NcQ1loYdHthi-nYA2ZXcuuetCHE_0N0fRi0mdaf90VaLk0Y2ehrnVzoZraYO7jLhB7Pl68_k4l3HCqkFVGuMOzZ26cHYkfc=@proton.me>

Am 12.07.25 um 11:45 schrieb Jason Cho:

Show 20 quoted lines

> ```MINGW64 /tmp/summer-temp/dbeaver/docs ((e4219ccb38...))
> $ git log -1 --patch license_header.txt
> commit b5121d4a6e8f3f21079920180b0fb14ada6d3349
> Author: serge-rider <serge@jkiss.org>
> Date:   Thu Jan 10 21:56:55 2019 +0300
> 
>     License header update (2019)
> 
> diff --git a/docs/license_header.txt b/docs/license_header.txt
> index 86de505a18..d75b48e98e 100644
> --- a/docs/license_header.txt
> +++ b/docs/license_header.txt
> @@ -1,5 +1,5 @@
>     DBeaver - Universal Database Manager
> -   Copyright (C) 2010-2018 Serge Rider (serge@jkiss.org)
> +   Copyright (C) 2010-2019 Serge Rider (serge@jkiss.org)^M
> 
>     Licensed under the Apache License, Version 2.0 (the "License");
>     you may not use this file except in compliance with the License.
>

Since you posted `git diff` output, may I ask if your concern is actually the ^M in the diff output, which you intend to fix with automatic CRLF-to-LF conversion?

In that case, the simpler solution is to set core.whitespace such that it includes 'cr-at-eol' to convince `git diff` not to mark the CR in the CRLF pair as a trailing whitespace error.

-- Hannes