| commit | fb094cb583e9e0f3842a6c445ccf84455cf17136 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 9 Sep 2022 19:02:24 +0000 (9 12:02 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 9 Sep 2022 19:02:24 +0000 (9 12:02 -0700) | ||
| tree | 449854298d55d9626386debe2404fd0e1063b22c | treesnapshot (tar.gz zip) |
| parent | 79f2338b3746d23454308648b2491e5beba4beff | commitdiff |
| parent | 0a101676e58481f134353ee1ff3ccee6cbbbb74b | commitdiff |
Merge branch 'js/add-p-diff-parsing-fix'
Those who use diff-so-fancy as the diff-filter noticed a regression
or two in the code that parses the diff output in the built-in
version of "add -p", which has been corrected.
* js/add-p-diff-parsing-fix:
add -p: ignore dirty submodules
add -p: gracefully handle unparseable hunk headers in colored diffs
add -p: detect more mismatches between plain vs colored diffs
Those who use diff-so-fancy as the diff-filter noticed a regression
or two in the code that parses the diff output in the built-in
version of "add -p", which has been corrected.
* js/add-p-diff-parsing-fix:
add -p: ignore dirty submodules
add -p: gracefully handle unparseable hunk headers in colored diffs
add -p: detect more mismatches between plain vs colored diffs
| t/t3701-add-interactive.sh | diff1 | diff2 | blobhistory |