From: Sergey Organov Date: Thu, 20 May 2021 21:46:54 +0000 (+0300) Subject: t4013: test that "-m" alone has no effect in "git log" X-Git-Tag: v2.33.0-rc0~111^2~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a55fa0e0bb88e2bf721bc65cc55cd6b435a8373;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- 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 &&