diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2017-01-19 21:30:40 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-01-19 13:23:43 -0800 |
commit | 019678d6b1f83419cdc35e3d455175adce3a379c (patch) | |
tree | d023c50ba54786bec05c089daa83cbf96fa3f51a /git.c | |
parent | 03831ef7b5011cbedbcc67abe5f47762f37c6c21 (diff) | |
download | git-019678d6b1f83419cdc35e3d455175adce3a379c.tar.gz |
difftool: retire the scripted version
It served its purpose, but now we have a builtin difftool. Time for the
Perl script to enjoy Florida.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git.c')
-rw-r--r-- | git.c | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -424,12 +424,7 @@ static struct cmd_struct commands[] = { { "diff-files", cmd_diff_files, RUN_SETUP | NEED_WORK_TREE }, { "diff-index", cmd_diff_index, RUN_SETUP }, { "diff-tree", cmd_diff_tree, RUN_SETUP }, - /* - * NEEDSWORK: Once the redirection to git-legacy-difftool.perl in - * builtin/difftool.c has been removed, this entry should be changed to - * RUN_SETUP | NEED_WORK_TREE - */ - { "difftool", cmd_difftool }, + { "difftool", cmd_difftool, RUN_SETUP | NEED_WORK_TREE }, { "fast-export", cmd_fast_export, RUN_SETUP }, { "fetch", cmd_fetch, RUN_SETUP }, { "fetch-pack", cmd_fetch_pack, RUN_SETUP }, |