mergetool: don't require a work tree for --tool-help
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>
Charles Bailey committed
Oct 11, 2014 at 01:39 UTC
7bfb7c357cd33a9f3a72d65b0df96e054d2a9f06
1 file changed
+4
-1
git-mergetool.sh
+4
-1
@@ -10,11 +10,11 @@
10
11
USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [file to merge] ...'
12
SUBDIRECTORY_OK=Yes
13
+NONGIT_OK=Yes
14
OPTIONS_SPEC=
15
TOOL_MODE=merge
16
. git-sh-setup
17
. git-mergetool--lib
17
-require_work_tree
18
19
# Returns true if the mode reflects a symlink
20
is_symlink () {
@@ -377,6 +377,9 @@ prompt_after_failed_merge () {
377
done
378
}
379
380
+git_dir_init
381
+require_work_tree
382
+
383
if test -z "$merge_tool"
384
then
385
merge_tool=$(get_merge_tool "$merge_tool") || exit