undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mergetool: don't require a work tree for --tool-help

Browse Source 
Signed-off-by: Charles Bailey <cbailey32@bloomberg.net>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Charles Bailey 2014-10-11 01:39:37 -07:00 committed by Junio C Hamano
parent 1c7e2d23e4
commit 7bfb7c357c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
git-mergetool.sh
View File

@ -10,11 +10,11 @@
USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [file to merge] ...' USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [file to merge] ...'
SUBDIRECTORY_OK=Yes SUBDIRECTORY_OK=Yes
NONGIT_OK=Yes
OPTIONS_SPEC= OPTIONS_SPEC=
TOOL_MODE=merge TOOL_MODE=merge
. git-sh-setup . git-sh-setup
. git-mergetool--lib . git-mergetool--lib
require_work_tree
# Returns true if the mode reflects a symlink # Returns true if the mode reflects a symlink
is_symlink () { is_symlink () {
@ -377,6 +377,9 @@ prompt_after_failed_merge () {
done done
} }
git_dir_init
require_work_tree
if test -z "$merge_tool" if test -z "$merge_tool"
then then
merge_tool=$(get_merge_tool "$merge_tool") || exit merge_tool=$(get_merge_tool "$merge_tool") || exit