checkout-index: work from subdirectory.

diff --git a/diff-files.c b/diff-files.c
index 8a8f9b6dc77683bd7926f8599a2aa6eb03023b57..38599b5b755df431e3e061df8a304698cc4496fc 100644 (file)
--- a/diff-files.c
+++ b/diff-files.c
@@ -38,9 +38,14 @@ int main(int argc, const char **argv)
        const char *prefix = setup_git_directory();
        int entries, i;
 
-       git_config(git_default_config);
+       git_config(git_diff_config);
        diff_setup(&diff_options);
        while (1 < argc && argv[1][0] == '-') {
+               if (!strcmp(argv[1], "--")) {
+                       argv++;
+                       argc--;
+                       break;
+               }
                if (!strcmp(argv[1], "-q"))
                        silent = 1;
                else if (!strcmp(argv[1], "-r"))