Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'js/difftool-no-index'
author
Junio C Hamano
<gitster@pobox.com>
Sun, 19 May 2019 07:45:35 +0000
(16:45 +0900)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 19 May 2019 07:45:35 +0000
(16:45 +0900)
The "--dir-diff" mode of "git difftool" is not useful in "--no-index"
mode; they are now explicitly marked as mutually incompatible.
* js/difftool-no-index:
difftool --no-index: error out on --dir-diff (and don't crash)
builtin/difftool.c
patch
|
blob
|
history
raw
(from parent 1:
8c59ba9
)
diff --git
a/builtin/difftool.c
b/builtin/difftool.c
index 53188df71438ad83186bcae37a8742704ae048a5..16eb8b70ea33eb00516d7ab035a90df9728d5296 100644
(file)
--- a/
builtin/difftool.c
+++ b/
builtin/difftool.c
@@
-727,7
+727,8
@@
int cmd_difftool(int argc, const char **argv, const char *prefix)
setup_work_tree();
setenv(GIT_DIR_ENVIRONMENT, absolute_path(get_git_dir()), 1);
setenv(GIT_WORK_TREE_ENVIRONMENT, absolute_path(get_git_work_tree()), 1);
- }
+ } else if (dir_diff)
+ die(_("--dir-diff is incompatible with --no-index"));
if (use_gui_tool + !!difftool_cmd + !!extcmd > 1)
die(_("--gui, --tool and --extcmd are mutually exclusive"));