diff options
| author |  Sergey Organov <sorganov@gmail.com> | 2021-05-21 00:46:54 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-05-21 09:24:13 +0900 |
| commit | 7a55fa0e0bb88e2bf721bc65cc55cd6b435a8373 (patch) | |
| tree | e23eb6b354b46c64d06cc53b84cba2d1f6c4d8a2 | |
| parent | doc/diff-options: document new --diff-merges features (diff) | |
| download | tgif-7a55fa0e0bb88e2bf721bc65cc55cd6b435a8373.tar.xz | |
t4013: test that "-m" alone has no effect in "git log"
This is to notice current behavior that we are going to change when we
start to imply "-p" by "-m".
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t4013-diff-various.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 87def81699..e9f67cd243 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -452,6 +452,14 @@ diff-tree --stat --compact-summary initial mode diff-tree -R --stat --compact-summary initial mode EOF +test_expect_success 'log -m matches pure log' ' + git log master >result && + process_diffs result >expected && + git log -m >result && + process_diffs result >actual && + test_cmp expected actual +' + test_expect_success 'log --diff-merges=on matches --diff-merges=separate' ' git log -p --diff-merges=separate master >result && process_diffs result >expected && |