diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-17 02:14:30 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-17 02:14:30 +0300 |
| commit | 9a160990ef3a16fab8d54752d0d9b981d15b00c5 (patch) | |
| tree | 8c8fdf47b518062223f49fb1105879c5ba3a06cc /t/t4202-log.sh | |
| parent | 70ff41ffcf93aed8198368af435b0c53fe55ed05 (diff) | |
| parent | 75408ca94980c125b3a800003c3e6b7cdcb27d44 (diff) | |
Merge branch 'js/diff-filter-negation-fix'
"git diff --diff-filter=aR" is now parsed correctly.
* js/diff-filter-negation-fix:
diff-filter: be more careful when looking for negative bits
diff.c: move the diff filter bits definitions up a bit
docs(diff): lose incorrect claim about `diff-files --diff-filter=A`
Diffstat (limited to 't/t4202-log.sh')
| -rwxr-xr-x | t/t4202-log.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh index dc884107de..a20d578349 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -142,6 +142,19 @@ test_expect_success 'diff-filter=R' ' ' +test_expect_success 'multiple --diff-filter bits' ' + + git log -M --pretty="format:%s" --diff-filter=R HEAD >expect && + git log -M --pretty="format:%s" --diff-filter=Ra HEAD >actual && + test_cmp expect actual && + git log -M --pretty="format:%s" --diff-filter=aR HEAD >actual && + test_cmp expect actual && + git log -M --pretty="format:%s" \ + --diff-filter=a --diff-filter=R HEAD >actual && + test_cmp expect actual + +' + test_expect_success 'diff-filter=C' ' git log -C -C --pretty="format:%s" --diff-filter=C HEAD >actual && |