summaryrefslogtreecommitdiff
path: root/t/t9902-completion.sh
diff options
context:
space:
mode:
authorSergey Organov <sorganov@gmail.com>2021-04-13 11:41:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-04-17 06:38:35 (GMT)
commit17c13e60fd799336b28d320dcba06fe1ef06e01d (patch)
tree06050127b529d7308656ae8a218c3e7c9db5d431 /t/t9902-completion.sh
parent38fc4dbbc2f110192752a3b2c99abb745f0494bf (diff)
downloadgit-17c13e60fd799336b28d320dcba06fe1ef06e01d.zip
git-17c13e60fd799336b28d320dcba06fe1ef06e01d.tar.gz
git-17c13e60fd799336b28d320dcba06fe1ef06e01d.tar.bz2
diff-merges: introduce log.diffMerges config variable
New log.diffMerges configuration variable sets the format that --diff-merges=on will be using. The default is "separate". t4013: add the following tests for log.diffMerges config: * Test that wrong values are denied. * Test that the value of log.diffMerges properly affects both --diff-merges=on and -m. t9902: fix completion tests for log.d* to match log.diffMerges. Added documentation for log.diffMerges. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9902-completion.sh')
-rwxr-xr-xt/t9902-completion.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 04ce884..4d732d6 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -2306,6 +2306,7 @@ test_expect_success 'git config - variable name' '
test_completion "git config log.d" <<-\EOF
log.date Z
log.decorate Z
+ log.diffMerges Z
EOF
'
@@ -2327,6 +2328,7 @@ test_expect_success 'git -c - variable name' '
test_completion "git -c log.d" <<-\EOF
log.date=Z
log.decorate=Z
+ log.diffMerges=Z
EOF
'
@@ -2348,6 +2350,7 @@ test_expect_success 'git clone --config= - variable name' '
test_completion "git clone --config=log.d" <<-\EOF
log.date=Z
log.decorate=Z
+ log.diffMerges=Z
EOF
'