Commit bd2ecba
diff: stop output garbled message in dry run mode
In dry run mode, diff_flush_patch() should not produce any output.
However, in commit b55e6d3 (diff: ensure consistent diff behavior
with ignore options, 2025-08-08), only the output during the
comparison of two file contents was suppressed. For file deletions
or mode changes, diff_flush_patch() still produces output. In
run_extern_diff(), set quiet to true if in dry run mode. In
emit_diff_symbol_from_struct(), directly return if in dry run mode.
Signed-off-by: Lidong Yan <[email protected]>
Signed-off-by: Johannes Schindelin <[email protected]>1 parent 2755072 commit bd2ecba
2 files changed
+25
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1357 | 1357 | | |
1358 | 1358 | | |
1359 | 1359 | | |
| 1360 | + | |
| 1361 | + | |
| 1362 | + | |
1360 | 1363 | | |
1361 | 1364 | | |
1362 | 1365 | | |
| |||
4426 | 4429 | | |
4427 | 4430 | | |
4428 | 4431 | | |
4429 | | - | |
| 4432 | + | |
4430 | 4433 | | |
4431 | 4434 | | |
4432 | 4435 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
661 | 661 | | |
662 | 662 | | |
663 | 663 | | |
| 664 | + | |
| 665 | + | |
| 666 | + | |
| 667 | + | |
| 668 | + | |
| 669 | + | |
| 670 | + | |
| 671 | + | |
| 672 | + | |
| 673 | + | |
| 674 | + | |
| 675 | + | |
| 676 | + | |
| 677 | + | |
| 678 | + | |
| 679 | + | |
| 680 | + | |
| 681 | + | |
| 682 | + | |
| 683 | + | |
| 684 | + | |
664 | 685 | | |
665 | 686 | | |
666 | 687 | | |
| |||
0 commit comments