Re: [PATCH 4/4] doc add: renormalize is not idempotent for CRCRLF
- From
Torsten Bögershausen <tboegi@web.de>
- Date
- Jul 10, 2022, 07:48 UTC
- Message-ID
- <20220710074848.ku2zobuck6vyim5d@tb-raspi4>
- In-Reply-To
- <d3b8ed97a105ea1d7e656c964b7eee378e11ede6.1657385781.git.gitgitgadget@gmail.com>
On Sat, Jul 09, 2022 at 04:56:21PM +0000, Philip Oakley via GitGitGadget wrote:
Show 8 quoted lines
> From: Philip Oakley <philipoakley@iee.email> > > Bug report > https://lore.kernel.org/git/AM0PR02MB56357CC96B702244F3271014E8DC9@AM0PR02MB5635.eurprd02.prod.outlook.com/ > noted that a file containing /r/r/n needed renormalising twice. > > This is by design. Lone CR characters, not paired with an LF, are left > unchanged.
This is all fine.
> Note the lack of idempotentness of the "clean" filter in the > documentation.
The clean filter is idempotent, I would claim, see below. You can run it, and re-run, and re-run, there will no other changes. CRLF in the worktree will become LF in the repo, 'lone CR' stay as they are. In that sense, CRCRLF in the worktree will become CRLF in the repo. You can the renormalize again and again.
The "trick" is that the user has to decide what CRCRLF mean and what should happen in the repo: CRCRLF in the worktree becomes one line ending (one LF in the repo) or CRCRLF in the worktree becomes two line endings ( LFLF in the repo)
For a) you can use dos2unix twice. Or run `git add --renormalize` followed by `rm git.bdf` `git restore .`
The thing is that we used a combination of different commands $ git add --renormalize . $ git commit -m "Renormalize bdf.txt" $ rm git.bdf $ git restore . $ git add --renormalize . $ git commit -m "Renormalize a second time bdf.txt"
... to clean up this very situation.
And, if CRCRLF should have become LFLF instead ? Probably a python script is needed to fix this. (or some other script/program in the language of your choice)
We could argue that `git add --renormalize` is idempotent, but a series of carefully crafted commands is not. In short, what is missing is the documentation how CRCRLF is handled by Git.
Show 18 quoted lines
> > Renormalize was introduced at 9472935d81e (add: introduce "--renormalize", > Torsten Bögershausen, 2017-11-16) > > Signed-off-by: Philip Oakley <philipoakley@iee.email> > --- > Documentation/git-add.txt | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt > index 11eb70f16c7..c4a5ad11a6b 100644 > --- a/Documentation/git-add.txt > +++ b/Documentation/git-add.txt > @@ -188,7 +188,8 @@ for "git add --no-all <pathspec>...", i.e. ignored removed files. > forcibly add them again to the index. This is useful after > changing `core.autocrlf` configuration or the `text` attribute > in order to correct files added with wrong CRLF/LF line endings. > - This option implies `-u`.
> + This option implies `-u`. Lone CR characters are untouched, so > + cleaning not idempotent. A CRCRLF sequence cleans to CRLF.
How about this:
This option implies `-u`. Lone CR characters are untouched. CRCRLF cleans to CRLF.