diff options
| author | Charles Bailey <cbailey32@bloomberg.net> | 2014-10-11 10:39:38 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-15 23:12:20 +0200 |
| commit | 4fb4b02d98310f4f859f7d52f57f36d49198be5c (patch) | |
| tree | e0d306e3100bb5f6c19dbe70d44898082b52cbb8 /git-mergetool.sh | |
| parent | mergetool: don't require a work tree for --tool-help (diff) | |
| download | git-4fb4b02d98310f4f859f7d52f57f36d49198be5c.tar.xz git-4fb4b02d98310f4f859f7d52f57f36d49198be5c.zip | |
difftool: don't assume that default sh is sane
git-difftool used to create a command list script containing $( ... )
and explicitly calls "sh -c" with this list.
Instead, allow mergetool --tool-help to take a mode parameter and call
mergetool directly to invoke the show_tool_help function. This mode
parameter is intented for use solely by difftool.
Signed-off-by: Charles Bailey <cbailey32@bloomberg.net>
Helped-by: John Keeping <john@keeping.me.uk>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
| -rwxr-xr-x | git-mergetool.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh index 8098d2dc07..821253e368 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -326,6 +326,10 @@ prompt=$(git config --bool mergetool.prompt || echo true) while test $# != 0 do case "$1" in + --tool-help=*) + TOOL_MODE=${1#--tool-help=} + show_tool_help + ;; --tool-help) show_tool_help ;; |