[PATCH 5/9] t4013: add test for --diff-merges=def
From: Sergey Organov <hidden>
Date: 2021-04-07 22:56:31
Subsystem:
the rest · Maintainer:
Linus Torvalds
This new option by default should match --diff-merges=separate, so test this. Signed-off-by: Sergey Organov <redacted> --- t/t4013-diff-various.sh | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 6cca8b84a6bf..275a6790896d 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 --diff-merges=def matches --diff-merges=separate' ' + git log -p --diff-merges=separate master >result && + process_diffs result >expected && + git log -p --diff-merges=def master >result && + process_diffs result >actual && + test_cmp expected actual +' + test_expect_success 'log -S requires an argument' ' test_must_fail git log -S '
--
2.25.1