diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2008-08-28 20:02:12 +0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-08-28 20:50:10 -0700 |
commit | 4f38f6b5bafb1f7f85c7b54d0bb0a0e977cd947c (patch) | |
tree | 899a49f15362f957cf67c71b23f9435e5600ebf6 /git.c | |
parent | c67b1fa349cc7b4341b32b9ef1c58a3821ce0830 (diff) | |
download | git-4f38f6b5bafb1f7f85c7b54d0bb0a0e977cd947c.tar.gz |
diff*: fix worktree setup
This fixes "git diff", "git diff-files" and "git diff-index" to work
correctly under worktree setup. Because diff* family works in many modes
and not all of them require worktree, Junio made a nice summary
(with a little modification from me):
* diff-files is about comparing with work tree, so it obviously needs a
work tree;
* diff-index also does, except "diff-index --cached" or "diff --cached TREE"
* no-index is about random files outside git context, so it obviously
doesn't need any work tree;
* comparing two (or more) trees doesn't;
* comparing two blobs doesn't;
* comparing a blob with a random file doesn't;
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git.c')
-rw-r--r-- | git.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -286,7 +286,7 @@ static void handle_internal_command(int argc, const char **argv) { "count-objects", cmd_count_objects, RUN_SETUP }, { "describe", cmd_describe, RUN_SETUP }, { "diff", cmd_diff }, - { "diff-files", cmd_diff_files, RUN_SETUP }, + { "diff-files", cmd_diff_files, RUN_SETUP | NEED_WORK_TREE }, { "diff-index", cmd_diff_index, RUN_SETUP }, { "diff-tree", cmd_diff_tree, RUN_SETUP }, { "fast-export", cmd_fast_export, RUN_SETUP }, |