Skip to content

Commit e5a3c32

Browse files
authored
Rollup merge of #128755 - yaahc:jj-crlf, r=estebank
Integrate crlf directly into related test file instead via of .gitattributes resolves #128708 This PR seeks to resolve a contributor papercut when using jj to manage the git repo locally which does not support .gitattributes. It does so by integrating the crlf characters directly into the related test and disabling Git's end of line normalization logic across platforms for that specific file, instead of configuring git to always check out the files with alternative eol characters. related documentation: https://git-scm.com/docs/gitattributes#Documentation/gitattributes.txt-Unset-1
2 parents 8f5b50d + b174cf8 commit e5a3c32

File tree

2 files changed

+27
-27
lines changed

2 files changed

+27
-27
lines changed
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
warning-crlf.rs eol=crlf
1+
warning-crlf.rs -text
+26-26
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
// ignore-tidy-cr
2-
//@ check-pass
3-
4-
// This file checks the spans of intra-link warnings in a file with CRLF line endings. The
5-
// .gitattributes file in this directory should enforce it.
6-
7-
/// [error]
8-
pub struct A;
9-
//~^^ WARNING `error`
10-
11-
///
12-
/// docs [error1]
13-
//~^ WARNING `error1`
14-
15-
/// docs [error2]
16-
///
17-
pub struct B;
18-
//~^^^ WARNING `error2`
19-
20-
/**
21-
* This is a multi-line comment.
22-
*
23-
* It also has an [error].
24-
*/
25-
pub struct C;
26-
//~^^^ WARNING `error`
1+
// ignore-tidy-cr
2+
//@ check-pass
3+
4+
// This file checks the spans of intra-link warnings in a file with CRLF line endings. The
5+
// .gitattributes file in this directory should enforce it.
6+
7+
/// [error]
8+
pub struct A;
9+
//~^^ WARNING `error`
10+
11+
///
12+
/// docs [error1]
13+
//~^ WARNING `error1`
14+
15+
/// docs [error2]
16+
///
17+
pub struct B;
18+
//~^^^ WARNING `error2`
19+
20+
/**
21+
* This is a multi-line comment.
22+
*
23+
* It also has an [error].
24+
*/
25+
pub struct C;
26+
//~^^^ WARNING `error`

0 commit comments

Comments
 (0)