Skip to contentSkip to conversation

gitattributes: fix eol attribute for Perl scripts

PATCH Superseded Koutian Wu via GitGitGadget 3 participants 5 messages Jun 15

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gitattributes: fix eol attribute for Perl scripts

From: ktwu01 <[email protected]>

The *.pl pattern currently sets eof=lf, which is not a built-in attribute used for line-ending normalization.

Use eol=lf instead, matching the neighboring *.perl and *.pm rules, so Perl scripts are checked out with LF line endings.

---
gitattributes: fix eol attribute for Perl scripts

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2151%2Fktwu01%2Fkw%2Ffix-pl-eol-attribute-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2151/ktwu01/kw/fix-pl-eol-attribute-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/2151

 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
.gitattributes +1 -1
index 556322be01..26490ad60a 100644
@@ -2,7 +2,7 @@
 *.[ch] whitespace=indent,trail,space,incomplete diff=cpp
 *.sh whitespace=indent,trail,space,incomplete text eol=lf
 *.perl text eol=lf diff=perl
-*.pl text eof=lf diff=perl
+*.pl text eol=lf diff=perl
 *.pm text eol=lf diff=perl
 *.py text eol=lf diff=python
 *.bat text eol=crlf

base-commit: ea97ad8d017de0c9037451a78008a0fd60abea0c

Signature · 1 line
gitgitgadget
#1 lore raw
Quoted 9 lines · Koutian Wu via GitGitGadget

From: ktwu01 <[email protected]>

The *.pl pattern currently sets eof=lf, which is not a built-in attribute used for line-ending normalization.

Use eol=lf instead, matching the neighboring *.perl and *.pm rules, so Perl scripts are checked out with LF line endings.

The Signed-off-by and commit author should use your real name, if possible. See [1].

.gitattributes line 8

Quoted 13 lines
.gitattributes +1 -1
index 556322be01..26490ad60a 100644
@@ -2,7 +2,7 @@
 *.[ch] whitespace=indent,trail,space,incomplete diff=cpp
 *.sh whitespace=indent,trail,space,incomplete text eol=lf
 *.perl text eol=lf diff=perl
-*.pl text eof=lf diff=perl
+*.pl text eol=lf diff=perl
 *.pm text eol=lf diff=perl
 *.py text eol=lf diff=python
 *.bat text eol=crlf

Yeah, this looks obviously correct to me. Thanks for the fix!

Patrick

[1]: https://git-scm.com/docs/SubmittingPatches#real-name

#2 lore raw

PATCH v2 1/1 gitattributes: fix eol attribute for Perl scripts

In reply to Koutian Wu via GitGitGadget

From: Koutian Wu <[email protected]>

The *.pl pattern currently sets eof=lf, which is not a built-in attribute used for line-ending normalization.

Use eol=lf instead, matching the neighboring *.perl and *.pm rules, so Perl scripts are checked out with LF line endings.

---
gitattributes: fix eol attribute for Perl scripts

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2151%2Fktwu01%2Fkw%2Ffix-pl-eol-attribute-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2151/ktwu01/kw/fix-pl-eol-attribute-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/2151

Range-diff vs v1:

1: 92ba4d499d ! 1: f4b4ca30c7 gitattributes: fix eol attribute for Perl scripts
@@
## Metadata ##
-Author: ktwu01 <[email protected]>
+Author: Koutian Wu <[email protected]>

## Commit message ##
gitattributes: fix eol attribute for Perl scripts
@@ Commit message
Use eol=lf instead, matching the neighboring *.perl and *.pm rules, so Perl scripts are checked out with LF line endings.

- Signed-off-by: ktwu01 <[email protected]>
+ Signed-off-by: Koutian Wu <[email protected]>

## .gitattributes ##
@@

 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
.gitattributes +1 -1
index 556322be01..26490ad60a 100644
@@ -2,7 +2,7 @@
 *.[ch] whitespace=indent,trail,space,incomplete diff=cpp
 *.sh whitespace=indent,trail,space,incomplete text eol=lf
 *.perl text eol=lf diff=perl
-*.pl text eof=lf diff=perl
+*.pl text eol=lf diff=perl
 *.pm text eol=lf diff=perl
 *.py text eol=lf diff=python
 *.bat text eol=crlf

base-commit: ea97ad8d017de0c9037451a78008a0fd60abea0c

Signature · 1 line
gitgitgadget
#3 lore raw
Quoted 14 lines · Koutian Wu via GitGitGadget

Range-diff vs v1:

1: 92ba4d499d ! 1: f4b4ca30c7 gitattributes: fix eol attribute for Perl scripts
@@
## Metadata ##
-Author: ktwu01 <[email protected]>
+Author: Koutian Wu <[email protected]>

## Commit message ##
gitattributes: fix eol attribute for Perl scripts
@@ Commit message
Use eol=lf instead, matching the neighboring *.perl and *.pm rules, so Perl scripts are checked out with LF line endings.

Quoted 5 lines

- Signed-off-by: ktwu01 <[email protected]>
+ Signed-off-by: Koutian Wu <[email protected]>

## .gitattributes ##
@@

Thanks, this version looks good to me!

Patrick

#4 lore raw
In reply to Koutian Wu via GitGitGadget
Quoted 4 lines · Koutian Wu via GitGitGadget

From: ktwu01 <[email protected]>
...

---

Thanks.

This typo come from 1f34e0cd (.gitattributes: include text attribute for eol attributes, 2023-02-03), that added "text" to those entries with eol=lf, which inherited from 20460635 (.gitattributes: use the "perl" differ for Perl, 2018-04-26), which inherited it while it was adding diff=perl from 00acdbc6 (.gitattributes: add *.pl extension for Perl, 2018-04-26) that added the .pl pattern. It is interesting that nobody seems to have noticed the typo during the reviews of these three patches that touched these lines ;-).

By the way, we'd prefer to interact with humans with real sounding names rather than handles, especially when it is not particularly secret. Your authorship and sign-off information will blend better in the community if you used "Koutian Wu".

Quoted 22 lines

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2151%2Fktwu01%2Fkw%2Ffix-pl-eol-attribute-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2151/ktwu01/kw/fix-pl-eol-attribute-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/2151

 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
.gitattributes +1 -1
index 556322be01..26490ad60a 100644
@@ -2,7 +2,7 @@
 *.[ch] whitespace=indent,trail,space,incomplete diff=cpp
 *.sh whitespace=indent,trail,space,incomplete text eol=lf
 *.perl text eol=lf diff=perl
-*.pl text eof=lf diff=perl
+*.pl text eol=lf diff=perl
 *.pm text eol=lf diff=perl
 *.py text eol=lf diff=python
 *.bat text eol=crlf

base-commit: ea97ad8d017de0c9037451a78008a0fd60abea0c