mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
140b9478da
commit
f024913164
|
@ -173,8 +173,7 @@ series, where the head is chosen from the cover letter, the
|
||||||
threading makes every mail a reply to the previous one.
|
threading makes every mail a reply to the previous one.
|
||||||
+
|
+
|
||||||
The default is `--no-thread`, unless the `format.thread` configuration
|
The default is `--no-thread`, unless the `format.thread` configuration
|
||||||
is set. If `--thread` is specified without a style, it defaults to the
|
is set. `--thread` without an argument is equivalent to `--thread=shallow`.
|
||||||
style specified by `format.thread` if any, or else `shallow`.
|
|
||||||
+
|
+
|
||||||
Beware that the default for 'git send-email' is to thread emails
|
Beware that the default for 'git send-email' is to thread emails
|
||||||
itself. If you want `git format-patch` to take care of threading, you
|
itself. If you want `git format-patch` to take care of threading, you
|
||||||
|
|
|
@ -470,6 +470,11 @@ test_expect_success 'thread' '
|
||||||
check_threading expect.thread --thread main
|
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
|
cat >expect.in-reply-to <<EOF
|
||||||
---
|
---
|
||||||
Message-Id: <0>
|
Message-Id: <0>
|
||||||
|
|
Loading…
Reference in a new issue