diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-08-11 22:36:18 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-11 22:36:18 +0300 |
| commit | 4c90d8908ac0c7ec9cd8d2caee7a1a0394636612 (patch) | |
| tree | f2e35ad1607e81d578c6ffe9798b7129c1579f05 /t | |
| parent | 7cfaa86fe6f61698752d13c59ac97a102d1fbaae (diff) | |
| parent | 6a38e33331560c3e84123c567f95de72d1cfa506 (diff) | |
Merge branch 'jn/log-m-does-not-imply-p'
Earlier "git log -m" was changed to always produce patch output,
which would break existing scripts, which has been reverted.
* jn/log-m-does-not-imply-p:
Revert 'diff-merges: let "-m" imply "-p"'
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4013-diff-various.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 7fadc985cc..e561a8e485 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -455,8 +455,8 @@ diff-tree --stat --compact-summary initial mode diff-tree -R --stat --compact-summary initial mode EOF -test_expect_success 'log -m matches log -m -p' ' - git log -m -p master >result && +test_expect_success 'log -m matches pure log' ' + git log master >result && process_diffs result >expected && git log -m >result && process_diffs result >actual && |