Commit 29228cb
committed
diff: refactor output of incomplete line
Create a helper function that reacts to "\ No newline at the end of
file" in preparation for unifying the incomplete line handling in
the code path that handles xdiff output and the code path that
bypasses xdiff and produces a complete-rewrite patch.
Currently the output from the DIFF_SYMBOL_CONTEXT_INCOMPLETE case
still (ab)uses the same code as what is used for context lines, but
that would change in a later step where we introduce support to treat
an incomplete line as a whitespace error.
Signed-off-by: Junio C Hamano <gitster@pobox.com>1 parent ced0561 commit 29228cb
1 file changed
+12
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1379 | 1379 | | |
1380 | 1380 | | |
1381 | 1381 | | |
| 1382 | + | |
| 1383 | + | |
| 1384 | + | |
| 1385 | + | |
1382 | 1386 | | |
1383 | 1387 | | |
1384 | 1388 | | |
| |||
1668 | 1672 | | |
1669 | 1673 | | |
1670 | 1674 | | |
| 1675 | + | |
| 1676 | + | |
| 1677 | + | |
| 1678 | + | |
| 1679 | + | |
| 1680 | + | |
| 1681 | + | |
1671 | 1682 | | |
1672 | 1683 | | |
1673 | 1684 | | |
| |||
2437 | 2448 | | |
2438 | 2449 | | |
2439 | 2450 | | |
2440 | | - | |
2441 | | - | |
| 2451 | + | |
2442 | 2452 | | |
2443 | 2453 | | |
2444 | 2454 | | |
| |||
0 commit comments