Merge branch 'jt/fetch-no-update-shallow-in-proto-v2'

[thirdparty/git.git] / git.c

diff --git a/git.c b/git.c
index 1c4fa3e3efdb6a086cb696f01bf5844a7d6aae91..50da125c60a317d820cec18767ef1fc88efd56bf 100644 (file)
--- a/git.c
+++ b/git.c
@@ -498,7 +498,7 @@ static struct cmd_struct commands[] = {
        { "diff-files", cmd_diff_files, RUN_SETUP | NEED_WORK_TREE | NO_PARSEOPT },
        { "diff-index", cmd_diff_index, RUN_SETUP | NO_PARSEOPT },
        { "diff-tree", cmd_diff_tree, RUN_SETUP | NO_PARSEOPT },
-       { "difftool", cmd_difftool, RUN_SETUP | NEED_WORK_TREE },
+       { "difftool", cmd_difftool, RUN_SETUP_GENTLY },
        { "fast-export", cmd_fast_export, RUN_SETUP },
        { "fetch", cmd_fetch, RUN_SETUP },
        { "fetch-pack", cmd_fetch_pack, RUN_SETUP | NO_PARSEOPT },