aboutsummaryrefslogtreecommitdiff
path: root/t/t4014-format-patch.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-04-21 15:35:04 -0700
committerJunio C Hamano <gitster@pobox.com>2023-04-21 15:35:05 -0700
commit9e0d1aa495bd26f4688b915ac5c3cb656c9f7174 (patch)
treea2f26c9484a50995738eb6c7d8b4a60b953abbcf /t/t4014-format-patch.sh
parent7ac228c99451970bc1c31f32cbbd273311cd3a02 (diff)
parentf024913164ae6ec53bd97c0fb8481abb0fecd86d (diff)
downloadgit-9e0d1aa495bd26f4688b915ac5c3cb656c9f7174.tar.xz
Merge branch 'ah/format-patch-thread-doc'
Doc update. * ah/format-patch-thread-doc: format-patch: correct documentation of --thread without an argument
Diffstat (limited to 't/t4014-format-patch.sh')
-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 7f1d4e8d58..3cf2b7a7fb 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>