[PATCH 3/5] git-config: document --bool-or-str and --type=bool-or-str
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Apr 8, 2021, 13:34 UTC
- Message-ID
- <patch-3.6-8aa59b3118-20210408T133125Z-avarab@gmail.com>
- In-Reply-To
- <cover-0.6-0000000000-20210408T133125Z-avarab@gmail.com>
Document the new "bool-or-str" facility added in dbd8c09bfe (mergetool: allow auto-merge for meld to follow the vim-diff behavior, 2020-05-07).
Unfortunately that commit also added a --bool-or-str option, even though we've preferred to deprecate that form ever since fb0dc3bac1 (builtin/config.c: support `--type=<type>` as preferred alias for `--<type>`, 2018-04-18).
Since we've got it already let's document it along with the preferred --type=* form, and change our own code to use the --type=bool-or-str form over --bool-or-str.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- Documentation/git-config.txt | 3 +++ mergetools/meld | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index 4b4cc5c5e8..4ae9ef210c 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -187,6 +187,8 @@ Valid `<type>`'s include: 1073741824 upon input. - 'bool-or-int': canonicalize according to either 'bool' or 'int', as described above. +- 'bool-or-str: canonicalize according to either 'bool' (as described + above), or emit the value as-is. - 'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable @@ -202,6 +204,7 @@ Valid `<type>`'s include: --bool:: --int:: --bool-or-int:: +--bool-or-str:: --path:: --expiry-date:: Historical options for selecting a type specifier. Prefer instead `--type` diff --git a/mergetools/meld b/mergetools/meld index aab4ebb935..8386e0574e 100644 --- a/mergetools/meld +++ b/mergetools/meld @@ -59,7 +59,7 @@ check_meld_for_features () { if test -z "$meld_use_auto_merge_option" then meld_use_auto_merge_option=$( - git config --bool-or-str mergetool.meld.useAutoMerge + git config --type=bool-or-str mergetool.meld.useAutoMerge ) case "$meld_use_auto_merge_option" in true | false)
-- 2.31.1.527.g9b8f7de2547