X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fdiff-files.c;h=951c7c8994704543fc1784c87a17a1aa47ede257;hb=0d7f242110dc71666780a85fca14fbc8223879d4;hp=5b64011de8222f06b5c772a6461278dea152919e;hpb=4cd1b99c32d9a345438d098f37e75077d072778f;p=git.git diff --git a/builtin/diff-files.c b/builtin/diff-files.c index 5b64011de..46085f862 100644 --- a/builtin/diff-files.c +++ b/builtin/diff-files.c @@ -8,6 +8,7 @@ #include "commit.h" #include "revision.h" #include "builtin.h" +#include "submodule.h" static const char diff_files_usage[] = "git diff-files [-q] [-0/-1/2/3 |-c|--cc] [] [...]" @@ -20,6 +21,7 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix) unsigned options = 0; init_revisions(&rev, prefix); + gitmodules_config(); git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ rev.abbrev = 0; @@ -59,7 +61,7 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix) (rev.diffopt.output_format & DIFF_FORMAT_PATCH)) rev.combine_merges = rev.dense_combined_merges = 1; - if (read_cache_preload(rev.diffopt.paths) < 0) { + if (read_cache_preload(rev.diffopt.pathspec.raw) < 0) { perror("read_cache_preload"); return -1; }