mergetool: Accept -g/--[no-]gui as arguments
PATCH 1/2 mergetool: Accept -g/--[no-]gui as arguments
In line with how difftool accepts a -g/--[no-]gui option, make mergetool accept the same option in order to use the merge.guitool variable to find the default mergetool instead of merge.tool.
--- Documentation/git-mergetool.txt | 11 +++++++++++ git-mergetool--lib.sh | 16 +++++++++++----- git-mergetool.sh | 11 +++++++++-- 3 files changed, 31 insertions(+), 7 deletions(-)
Documentation/git-mergetool.txt +11 -0
@@ -79,6 +79,17 @@ success of the resolution after the custom tool has exited. Prompt before each invocation of the merge resolution program to give the user a chance to skip the path. +-g:: +--gui:: + When 'git-mergetool' is invoked with the `-g` or `--gui` option + the default merge tool will be read from the configured + `merge.guitool` variable instead of `merge.tool`. + +--no-gui:: + This overrides a previous `-g` or `--gui` setting and reads the + default merge tool will be read from the configured `merge.tool` + variable. + -O<orderfile>:: Process files in the order specified in the <orderfile>, which has one shell glob pattern per line.
git-mergetool--lib.sh +11 -5
@@ -350,17 +350,23 @@ guess_merge_tool () { } get_configured_merge_tool () { - # Diff mode first tries diff.tool and falls back to merge.tool. - # Merge mode only checks merge.tool + # If first argument is true, find the guitool instead + if [ "$1" = true ] + then + gui_prefix=gui + fi + + # Diff mode first tries diff.(gui)tool and falls back to merge.(gui)tool. + # Merge mode only checks merge.(gui)tool if diff_mode then - merge_tool=$(git config diff.tool || git config merge.tool) + merge_tool=$(git config diff.${gui_prefix}tool || git config merge.${gui_prefix}tool) else - merge_tool=$(git config merge.tool) + merge_tool=$(git config merge.${gui_prefix}tool) fi if test -n "$merge_tool" && ! valid_tool "$merge_tool" then - echo >&2 "git config option $TOOL_MODE.tool set to unknown tool: $merge_tool" + echo >&2 "git config option $TOOL_MODE.${gui_prefix}tool set to unknown tool: $merge_tool" echo >&2 "Resetting to default..." return 1 fi
git-mergetool.sh +9 -2
@@ -9,7 +9,7 @@ # at the discretion of Junio C Hamano. # -USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [-O<orderfile>] [file to merge] ...' +USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [-g|--gui|--no-gui] [-O<orderfile>] [file to merge] ...' SUBDIRECTORY_OK=Yes NONGIT_OK=Yes OPTIONS_SPEC=
@@ -389,6 +389,7 @@ print_noop_and_exit () { main () { prompt=$(git config --bool mergetool.prompt) + gui_tool=false guessed_merge_tool=false orderfile=
@@ -414,6 +415,12 @@ main () { shift ;; esac ;; + --no-gui) + gui_tool=false + ;; + -g|--gui) + gui_tool=true + ;; -y|--no-prompt) prompt=false ;;
@@ -443,7 +450,7 @@ main () { if test -z "$merge_tool" then # Check if a merge tool has been configured - merge_tool=$(get_configured_merge_tool) + merge_tool=$(get_configured_merge_tool $gui_tool) # Try to guess an appropriate merge tool if no tool has been set. if test -z "$merge_tool" then
Signature · 1 line
2.19.1
Quoted 1 line · Denton Liu
Subject: Re: [PATCH 1/2] mergetool: Accept -g/--[no-]gui as arguments
Other people may point it out, but s/Accept/accept/.
Quoted 9 lines
In line with how difftool accepts a -g/--[no-]gui option, make mergetool accept the same option in order to use the
merge.guitoolvariable to find the default mergetool instead ofmerge.tool.
...git-mergetool--lib.sh +0
-0
git-mergetool--lib.sh guess_merge_tool () { · line 354
Quoted 7 lines
git-mergetool--lib.sh +2
-2@@ -350,17 +350,23 @@ guess_merge_tool () { } get_configured_merge_tool () { - # Diff mode first tries diff.tool and falls back to merge.tool. - # Merge mode only checks merge.tool + # If first argument is true, find the guitool instead + if [ "$1" = true ]
Don't use [] in our shell script (see Documentation/CodingGuidelines); say
if "$1" = true
instead.
Quoted 4 lines
git-mergetool--lib.sh +4
-0+ then + gui_prefix=gui + fi +
git-mergetool--lib.sh guess_merge_tool () { · line 366
Quoted 10 lines
git-mergetool--lib.sh +4
-2+ # Diff mode first tries diff.(gui)tool and falls back to merge.(gui)tool. + # Merge mode only checks merge.(gui)tool if diff_mode then - merge_tool=$(git config diff.tool || git config merge.tool) + merge_tool=$(git config diff.${gui_prefix}tool || git config merge.${gui_prefix}tool) else - merge_tool=$(git config merge.tool) + merge_tool=$(git config merge.${gui_prefix}tool) fi
In mode_ok shell function, we seem to be prepared to deal with a case where neither diff_mode nor merge_mode is true. Should this codepath also be prepared to?
This is not a comment to point out an issue with this patch. It is a genuine question on the code after (or before for that matter) this patch is applied.
Thanks.
Quoted 4 lines · Junio C Hamano
In
mode_okshell function, we seem to be prepared to deal with a case where neitherdiff_modenormerge_modeis true. Should this codepath also be prepared to?
According to Documentation/git-mergetool--lib.txt,
Quoted 3 lines
Before sourcing 'git-mergetool{litdd}lib', your script must set
TOOL_MODEto define the operation mode for the functions listed below. 'diff' and 'merge' are valid values.
so I think that we can assume that the one of diff_mode or merge_mode will return true. In any case, it seems like the rest of the code was written under this assumption so if this needs to be changed then the whole library needs to be fixed as well.
David Aguilar
Acked-byQuoted 26 lines · Junio C Hamano
Quoted 1 line · Denton Liu
Subject: Re: [PATCH 1/2] mergetool: Accept -g/--[no-]gui as arguments
Other people may point it out, but s/Accept/accept/.
Quoted 9 lines
In line with how difftool accepts a -g/--[no-]gui option, make mergetool accept the same option in order to use the
merge.guitoolvariable to find the default mergetool instead ofmerge.tool.
...git-mergetool--lib.sh +0
-0git-mergetool--lib.sh guess_merge_tool () { · line 354
Quoted 7 lines
git-mergetool--lib.sh +2
-2@@ -350,17 +350,23 @@ guess_merge_tool () { } get_configured_merge_tool () { - # Diff mode first tries diff.tool and falls back to merge.tool. - # Merge mode only checks merge.tool + # If first argument is true, find the guitool instead + if [ "$1" = true ]Don't use [] in our shell script (see
Documentation/CodingGuidelines); say
Quoted 3 lines
if "$1" = trueinstead.
Perhaps a small typo dropped "test" -- I think it should be
if test "$1" = true
Quoted 15 lines
git-mergetool--lib.sh guess_merge_tool () { · line 366
Quoted 10 lines
git-mergetool--lib.sh +4
-2+ # Diff mode first tries diff.(gui)tool and falls back to merge.(gui)tool. + # Merge mode only checks merge.(gui)tool if diff_mode then - merge_tool=$(git config diff.tool || git config merge.tool) + merge_tool=$(git config diff.${gui_prefix}tool || git config merge.${gui_prefix}tool) else - merge_tool=$(git config merge.tool) + merge_tool=$(git config merge.${gui_prefix}tool) fiIn
mode_okshell function, we seem to be prepared to deal with a case where neitherdiff_modenormerge_modeis true. Should this codepath also be prepared to?
Quoted 5 lines
This is not a comment to point out an issue with this patch. It is a genuine question on the code after (or before for that matter) this patch is applied.
Thanks.
I think the code is okay. mode_ok is setup that way to allow filtering for the other mode's tools, but this code path is only concerned with getting the default merge tool, which should only ever happen in one of the two modes.
The bit about difftool falling back to mergetool's config is a convenience so it does make sense to keep that for guitool as well.
The code after this part should handle merge_tool being empty just fine, so once the [ ... ] vs test bit is updated, please feel free to add:
cheers,
Signature · 1 line
David
PATCH v2 1/2 mergetool: accept -g/--[no-]gui as arguments
In reply to Junio C HamanoIn line with how difftool accepts a -g/--[no-]gui option, make mergetool accept the same option in order to use the merge.guitool variable to find the default mergetool instead of merge.tool.
--- Documentation/git-mergetool.txt | 11 +++++++++++ git-mergetool--lib.sh | 16 +++++++++++----- git-mergetool.sh | 11 +++++++++-- 3 files changed, 31 insertions(+), 7 deletions(-)
Documentation/git-mergetool.txt +11 -0
@@ -79,6 +79,17 @@ success of the resolution after the custom tool has exited. Prompt before each invocation of the merge resolution program to give the user a chance to skip the path. +-g:: +--gui:: + When 'git-mergetool' is invoked with the `-g` or `--gui` option + the default merge tool will be read from the configured + `merge.guitool` variable instead of `merge.tool`. + +--no-gui:: + This overrides a previous `-g` or `--gui` setting and reads the + default merge tool will be read from the configured `merge.tool` + variable. + -O<orderfile>:: Process files in the order specified in the <orderfile>, which has one shell glob pattern per line.
git-mergetool--lib.sh +11 -5
@@ -350,17 +350,23 @@ guess_merge_tool () { } get_configured_merge_tool () { - # Diff mode first tries diff.tool and falls back to merge.tool. - # Merge mode only checks merge.tool + # If first argument is true, find the guitool instead + if test "$1" = true + then + gui_prefix=gui + fi + + # Diff mode first tries diff.(gui)tool and falls back to merge.(gui)tool. + # Merge mode only checks merge.(gui)tool if diff_mode then - merge_tool=$(git config diff.tool || git config merge.tool) + merge_tool=$(git config diff.${gui_prefix}tool || git config merge.${gui_prefix}tool) else - merge_tool=$(git config merge.tool) + merge_tool=$(git config merge.${gui_prefix}tool) fi if test -n "$merge_tool" && ! valid_tool "$merge_tool" then - echo >&2 "git config option $TOOL_MODE.tool set to unknown tool: $merge_tool" + echo >&2 "git config option $TOOL_MODE.${gui_prefix}tool set to unknown tool: $merge_tool" echo >&2 "Resetting to default..." return 1 fi
git-mergetool.sh +9 -2
@@ -9,7 +9,7 @@ # at the discretion of Junio C Hamano. # -USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [-O<orderfile>] [file to merge] ...' +USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [-g|--gui|--no-gui] [-O<orderfile>] [file to merge] ...' SUBDIRECTORY_OK=Yes NONGIT_OK=Yes OPTIONS_SPEC=
@@ -389,6 +389,7 @@ print_noop_and_exit () { main () { prompt=$(git config --bool mergetool.prompt) + gui_tool=false guessed_merge_tool=false orderfile=
@@ -414,6 +415,12 @@ main () { shift ;; esac ;; + --no-gui) + gui_tool=false + ;; + -g|--gui) + gui_tool=true + ;; -y|--no-prompt) prompt=false ;;
@@ -443,7 +450,7 @@ main () { if test -z "$merge_tool" then # Check if a merge tool has been configured - merge_tool=$(get_configured_merge_tool) + merge_tool=$(get_configured_merge_tool $gui_tool) # Try to guess an appropriate merge tool if no tool has been set. if test -z "$merge_tool" then
Signature · 1 line
2.19.1
v3 cover Add --gui to mergetool
This adds another patch on top of the existing patchset in order to document the guitool keys for git config. This way, the completions script will now be able to complete these key values as well.
Denton Liu (3):
mergetool: accept -g/--[no-]gui as arguments
completion: support git mergetool --[no-]gui
doc: document diff/merge.guitool config keys
Documentation/diff-config.txt | 8 ++++++++ Documentation/git-mergetool.txt | 11 +++++++++++ Documentation/merge-config.txt | 6 ++++++ contrib/completion/git-completion.bash | 2 +- git-mergetool--lib.sh | 16 +++++++++++----- git-mergetool.sh | 11 +++++++++-- 6 files changed, 46 insertions(+), 8 deletions(-)
Signature · 1 line
2.19.1.544.ge0b0585a1.dirty
PATCH v3 1/3 mergetool: accept -g/--[no-]gui as arguments
In line with how difftool accepts a -g/--[no-]gui option, make mergetool accept the same option in order to use the merge.guitool variable to find the default mergetool instead of merge.tool.
--- Documentation/git-mergetool.txt | 11 +++++++++++ git-mergetool--lib.sh | 16 +++++++++++----- git-mergetool.sh | 11 +++++++++-- 3 files changed, 31 insertions(+), 7 deletions(-)
Documentation/git-mergetool.txt +11 -0
@@ -79,6 +79,17 @@ success of the resolution after the custom tool has exited. Prompt before each invocation of the merge resolution program to give the user a chance to skip the path. +-g:: +--gui:: + When 'git-mergetool' is invoked with the `-g` or `--gui` option + the default merge tool will be read from the configured + `merge.guitool` variable instead of `merge.tool`. + +--no-gui:: + This overrides a previous `-g` or `--gui` setting and reads the + default merge tool will be read from the configured `merge.tool` + variable. + -O<orderfile>:: Process files in the order specified in the <orderfile>, which has one shell glob pattern per line.
git-mergetool--lib.sh +11 -5
@@ -350,17 +350,23 @@ guess_merge_tool () { } get_configured_merge_tool () { - # Diff mode first tries diff.tool and falls back to merge.tool. - # Merge mode only checks merge.tool + # If first argument is true, find the guitool instead + if test "$1" = true + then + gui_prefix=gui + fi + + # Diff mode first tries diff.(gui)tool and falls back to merge.(gui)tool. + # Merge mode only checks merge.(gui)tool if diff_mode then - merge_tool=$(git config diff.tool || git config merge.tool) + merge_tool=$(git config diff.${gui_prefix}tool || git config merge.${gui_prefix}tool) else - merge_tool=$(git config merge.tool) + merge_tool=$(git config merge.${gui_prefix}tool) fi if test -n "$merge_tool" && ! valid_tool "$merge_tool" then - echo >&2 "git config option $TOOL_MODE.tool set to unknown tool: $merge_tool" + echo >&2 "git config option $TOOL_MODE.${gui_prefix}tool set to unknown tool: $merge_tool" echo >&2 "Resetting to default..." return 1 fi
git-mergetool.sh +9 -2
@@ -9,7 +9,7 @@ # at the discretion of Junio C Hamano. # -USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [-O<orderfile>] [file to merge] ...' +USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [-g|--gui|--no-gui] [-O<orderfile>] [file to merge] ...' SUBDIRECTORY_OK=Yes NONGIT_OK=Yes OPTIONS_SPEC=
@@ -389,6 +389,7 @@ print_noop_and_exit () { main () { prompt=$(git config --bool mergetool.prompt) + gui_tool=false guessed_merge_tool=false orderfile=
@@ -414,6 +415,12 @@ main () { shift ;; esac ;; + --no-gui) + gui_tool=false + ;; + -g|--gui) + gui_tool=true + ;; -y|--no-prompt) prompt=false ;;
@@ -443,7 +450,7 @@ main () { if test -z "$merge_tool" then # Check if a merge tool has been configured - merge_tool=$(get_configured_merge_tool) + merge_tool=$(get_configured_merge_tool $gui_tool) # Try to guess an appropriate merge tool if no tool has been set. if test -z "$merge_tool" then
Signature · 1 line
2.19.1.544.ge0b0585a1.dirty
PATCH RESEND v3 1/3 mergetool: accept -g/--[no-]gui as arguments
In reply to Denton LiuIn line with how difftool accepts a -g/--[no-]gui option, make mergetool accept the same option in order to use the merge.guitool variable to find the default mergetool instead of merge.tool.
--- Documentation/git-mergetool.txt | 11 +++++++++++ git-mergetool--lib.sh | 16 +++++++++++----- git-mergetool.sh | 11 +++++++++-- 3 files changed, 31 insertions(+), 7 deletions(-)
Documentation/git-mergetool.txt +11 -0
@@ -79,6 +79,17 @@ success of the resolution after the custom tool has exited. Prompt before each invocation of the merge resolution program to give the user a chance to skip the path. +-g:: +--gui:: + When 'git-mergetool' is invoked with the `-g` or `--gui` option + the default merge tool will be read from the configured + `merge.guitool` variable instead of `merge.tool`. + +--no-gui:: + This overrides a previous `-g` or `--gui` setting and reads the + default merge tool will be read from the configured `merge.tool` + variable. + -O<orderfile>:: Process files in the order specified in the <orderfile>, which has one shell glob pattern per line.
git-mergetool--lib.sh +11 -5
@@ -350,17 +350,23 @@ guess_merge_tool () { } get_configured_merge_tool () { - # Diff mode first tries diff.tool and falls back to merge.tool. - # Merge mode only checks merge.tool + # If first argument is true, find the guitool instead + if test "$1" = true + then + gui_prefix=gui + fi + + # Diff mode first tries diff.(gui)tool and falls back to merge.(gui)tool. + # Merge mode only checks merge.(gui)tool if diff_mode then - merge_tool=$(git config diff.tool || git config merge.tool) + merge_tool=$(git config diff.${gui_prefix}tool || git config merge.${gui_prefix}tool) else - merge_tool=$(git config merge.tool) + merge_tool=$(git config merge.${gui_prefix}tool) fi if test -n "$merge_tool" && ! valid_tool "$merge_tool" then - echo >&2 "git config option $TOOL_MODE.tool set to unknown tool: $merge_tool" + echo >&2 "git config option $TOOL_MODE.${gui_prefix}tool set to unknown tool: $merge_tool" echo >&2 "Resetting to default..." return 1 fi
git-mergetool.sh +9 -2
@@ -9,7 +9,7 @@ # at the discretion of Junio C Hamano. # -USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [-O<orderfile>] [file to merge] ...' +USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [-g|--gui|--no-gui] [-O<orderfile>] [file to merge] ...' SUBDIRECTORY_OK=Yes NONGIT_OK=Yes OPTIONS_SPEC=
@@ -389,6 +389,7 @@ print_noop_and_exit () { main () { prompt=$(git config --bool mergetool.prompt) + gui_tool=false guessed_merge_tool=false orderfile=
@@ -414,6 +415,12 @@ main () { shift ;; esac ;; + --no-gui) + gui_tool=false + ;; + -g|--gui) + gui_tool=true + ;; -y|--no-prompt) prompt=false ;;
@@ -443,7 +450,7 @@ main () { if test -z "$merge_tool" then # Check if a merge tool has been configured - merge_tool=$(get_configured_merge_tool) + merge_tool=$(get_configured_merge_tool $gui_tool) # Try to guess an appropriate merge tool if no tool has been set. if test -z "$merge_tool" then
Signature · 1 line
2.19.1
PATCH v3 2/3 completion: support `git mergetool --[no-]gui`
In reply to Denton Liu--- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
contrib/completion/git-completion.bash +1 -1
@@ -1833,7 +1833,7 @@ _git_mergetool () return ;; --*) - __gitcomp "--tool= --prompt --no-prompt" + __gitcomp "--tool= --prompt --no-prompt --gui --no-gui" return ;; esac
Signature · 1 line
2.19.1.544.ge0b0585a1.dirty
v3 cover Add --gui to mergetool
In reply to Denton LiuThis is a resend of patchset v3 where we add another patch on top of the existing patchset in order to document the guitool keys for git config. This way, the completions script will now be able to complete these key values as well.
Denton Liu (3):
mergetool: accept -g/--[no-]gui as arguments
completion: support git mergetool --[no-]gui
doc: document diff/merge.guitool config keys
Documentation/diff-config.txt | 8 ++++++++ Documentation/git-mergetool.txt | 11 +++++++++++ Documentation/merge-config.txt | 6 ++++++ contrib/completion/git-completion.bash | 2 +- git-mergetool--lib.sh | 16 +++++++++++----- git-mergetool.sh | 11 +++++++++-- 6 files changed, 46 insertions(+), 8 deletions(-)
Signature · 1 line
2.19.1
Re: [RESEND PATCH v3 0/3] Add --gui to mergetool
Thanks.
I think this one is identical to what has already been queued and nerged to 'next'.
k
PATCH RESEND v3 2/3 completion: support `git mergetool --[no-]gui`
In reply to Denton Liu--- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
contrib/completion/git-completion.bash +1 -1
@@ -1833,7 +1833,7 @@ _git_mergetool () return ;; --*) - __gitcomp "--tool= --prompt --no-prompt" + __gitcomp "--tool= --prompt --no-prompt --gui --no-gui" return ;; esac
Signature · 1 line
2.19.1
PATCH v3 3/3 doc: document diff/merge.guitool config keys
In reply to Denton Liu--- Documentation/diff-config.txt | 8 ++++++++ Documentation/merge-config.txt | 6 ++++++ 2 files changed, 14 insertions(+)
Documentation/diff-config.txt +8 -0
@@ -177,6 +177,14 @@ diff.tool:: Any other value is treated as a custom diff tool and requires that a corresponding difftool.<tool>.cmd variable is defined. +diff.guitool:: + Controls which diff tool is used by linkgit:git-difftool[1] when + the -g/--gui flag is specified. This variable overrides the value + configured in `merge.guitool`. The list below shows the valid + built-in values. Any other value is treated as a custom diff tool + and requires that a corresponding difftool.<guitool>.cmd variable + is defined. + include::mergetools-diff.txt[] diff.indentHeuristic::
Documentation/merge-config.txt +6 -0
@@ -63,6 +63,12 @@ merge.tool:: Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<tool>.cmd variable is defined. +merge.guitool:: + Controls which merge tool is used by linkgit:git-mergetool[1] when the + -g/--gui flag is specified. The list below shows the valid built-in values. + Any other value is treated as a custom merge tool and requires that a + corresponding mergetool.<guitool>.cmd variable is defined. + include::mergetools-merge.txt[] merge.verbosity::
Signature · 1 line
2.19.1.544.ge0b0585a1.dirty
PATCH RESEND v3 3/3 doc: document diff/merge.guitool config keys
In reply to Denton Liu--- Documentation/diff-config.txt | 8 ++++++++ Documentation/merge-config.txt | 6 ++++++ 2 files changed, 14 insertions(+)
Documentation/diff-config.txt +8 -0
@@ -177,6 +177,14 @@ diff.tool:: Any other value is treated as a custom diff tool and requires that a corresponding difftool.<tool>.cmd variable is defined. +diff.guitool:: + Controls which diff tool is used by linkgit:git-difftool[1] when + the -g/--gui flag is specified. This variable overrides the value + configured in `merge.guitool`. The list below shows the valid + built-in values. Any other value is treated as a custom diff tool + and requires that a corresponding difftool.<guitool>.cmd variable + is defined. + include::mergetools-diff.txt[] diff.indentHeuristic::
Documentation/merge-config.txt +6 -0
@@ -63,6 +63,12 @@ merge.tool:: Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<tool>.cmd variable is defined. +merge.guitool:: + Controls which merge tool is used by linkgit:git-mergetool[1] when the + -g/--gui flag is specified. The list below shows the valid built-in values. + Any other value is treated as a custom merge tool and requires that a + corresponding mergetool.<guitool>.cmd variable is defined. + include::mergetools-merge.txt[] merge.verbosity::
Signature · 1 line
2.19.1
PATCH v2 2/2 completion: support `git mergetool --[no-]gui`
In reply to Junio C Hamano--- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
contrib/completion/git-completion.bash +1 -1
@@ -1833,7 +1833,7 @@ _git_mergetool () return ;; --*) - __gitcomp "--tool= --prompt --no-prompt" + __gitcomp "--tool= --prompt --no-prompt --gui --no-gui" return ;; esac
Signature · 1 line
2.19.1