RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 21:37:35 +00:00
Code Issues Activity Actions

diff: Only output a unified/context header if there is a diff

Browse source
This commit is contained in:
Shannon Booth 2023-07-06 20:39:35 +12:00 • committed by Andreas Kling
parent c6c20d3bf3
commit 84b187e375
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Userland/Utilities/diff.cpp
View file

@ -57,6 +57,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto hunks = TRY(Diff::from_text(TRY(file1->read_until_eof()), TRY(file2->read_until_eof()), number_context_lines)); auto hunks = TRY(Diff::from_text(TRY(file1->read_until_eof()), TRY(file2->read_until_eof()), number_context_lines));
if (hunks.is_empty())
return 0;
if (unified) { if (unified) {
TRY(Diff::write_unified_header(filename1, filename2, *out)); TRY(Diff::write_unified_header(filename1, filename2, *out));
for (auto const& hunk : hunks) for (auto const& hunk : hunks)
@ -70,5 +73,5 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(Diff::write_normal(hunk, *out, color_output)); TRY(Diff::write_normal(hunk, *out, color_output));
} }
return hunks.is_empty() ? 0 : 1; return 1;
} }