aboutsummaryrefslogtreecommitdiffstats
path: root/t
diff options
context:
space:
mode:
authorAlex Henrie <alexhenrie24@gmail.com>2023-04-02 22:07:24 -0600
committerJunio C Hamano <gitster@pobox.com>2023-04-03 09:59:20 -0700
commitf024913164ae6ec53bd97c0fb8481abb0fecd86d (patch)
treeff40228ff2b2f84cd6d7afbd2372c5226558850c /t
parentThe sixth batch (diff)
downloadgit-f024913164ae6ec53bd97c0fb8481abb0fecd86d.tar.gz
git-f024913164ae6ec53bd97c0fb8481abb0fecd86d.zip
format-patch: correct documentation of --thread without an argument
In Git, almost all command line flags unconditionally override the corresponding config option.[1] Add a test to confirm that this is the case for `git format-patch --thread`. [1] https://lore.kernel.org/git/CAMMLpeS3+NUQa2oqpHKVo3yWQNVMgkEXrs4U5_ggvk31yQbezQ@mail.gmail.com/ Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t4014-format-patch.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 8c3d06622a..b27a72f78a 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -470,6 +470,11 @@ test_expect_success 'thread' '
check_threading expect.thread --thread main
'
+test_expect_success '--thread overrides format.thread=deep' '
+ test_config format.thread deep &&
+ check_threading expect.thread --thread main
+'
+
cat >expect.in-reply-to <<EOF
---
Message-Id: <0>