Skip to content

Commit 4fcb12b

Browse files
committed
fix: use --ignore-space-change instead of --ignore-all-space when Ignore All Whitespace Changes option is enabled (#1752)
Signed-off-by: leo <[email protected]>
1 parent 440c97b commit 4fcb12b

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

src/Commands/Diff.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public Diff(string repo, Models.DiffOption opt, int unified, bool ignoreWhitespa
2626
Context = repo;
2727

2828
if (ignoreWhitespace)
29-
Args = $"diff --no-color --no-ext-diff --patch --ignore-all-space --unified={unified} {opt}";
29+
Args = $"diff --no-color --no-ext-diff --patch --ignore-space-change --ignore-cr-at-eol --unified={unified} {opt}";
3030
else if (Models.DiffOption.IgnoreCRAtEOL)
3131
Args = $"diff --no-color --no-ext-diff --patch --ignore-cr-at-eol --unified={unified} {opt}";
3232
else

src/Resources/Locales/en_US.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@
332332
<x:String x:Key="Text.Diff.Binary" xml:space="preserve">BINARY DIFF</x:String>
333333
<x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">File Mode Changed</x:String>
334334
<x:String x:Key="Text.Diff.First" xml:space="preserve">First Difference</x:String>
335-
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignore All Whitespace Changes</x:String>
335+
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignore Whitespace Changes</x:String>
336336
<x:String x:Key="Text.Diff.Image.Blend" xml:space="preserve">BLEND</x:String>
337337
<x:String x:Key="Text.Diff.Image.Difference" xml:space="preserve">DIFFERENCE</x:String>
338338
<x:String x:Key="Text.Diff.Image.SideBySide" xml:space="preserve">SIDE-BY-SIDE</x:String>

src/Resources/Locales/id_ID.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@
319319
<x:String x:Key="Text.Diff.Binary" xml:space="preserve">DIFF BINARY</x:String>
320320
<x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">Mode Berkas Berubah</x:String>
321321
<x:String x:Key="Text.Diff.First" xml:space="preserve">Perbedaan Pertama</x:String>
322-
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Abaikan Semua Perubahan Whitespace</x:String>
322+
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Abaikan Perubahan Whitespace</x:String>
323323
<x:String x:Key="Text.Diff.Image.Blend" xml:space="preserve">BLEND</x:String>
324324
<x:String x:Key="Text.Diff.Image.Difference" xml:space="preserve">DIFFERENCE</x:String>
325325
<x:String x:Key="Text.Diff.Image.SideBySide" xml:space="preserve">SIDE-BY-SIDE</x:String>

src/Resources/Locales/ko_KR.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@
318318
<x:String x:Key="Text.Diff.Binary" xml:space="preserve">바이너리 비교</x:String>
319319
<x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">파일 모드 변경됨</x:String>
320320
<x:String x:Key="Text.Diff.First" xml:space="preserve">첫 번째 차이점</x:String>
321-
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">모든 공백 변경 사항 무시</x:String>
321+
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">공백 변경 사항 무시</x:String>
322322
<x:String x:Key="Text.Diff.Image.Blend" xml:space="preserve">혼합</x:String>
323323
<x:String x:Key="Text.Diff.Image.Difference" xml:space="preserve">차이점</x:String>
324324
<x:String x:Key="Text.Diff.Image.SideBySide" xml:space="preserve">나란히 보기</x:String>

0 commit comments

Comments
 (0)