diff: avoid some nesting

diff --git a/builtin/diff.c b/builtin/diff.c
index da69e4a3c81174cffe4d04b5531538b7d9fc78b2..24d6271625d02b5aba877ac17b13daf36f5db0aa 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -298,7 +298,9 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
                        break;
        }
 
-       prefix = setup_git_directory_gently(&nongit);
+       if (!no_index)
+               prefix = setup_git_directory_gently(&nongit);
+
        /*
         * Treat git diff with at least one path outside of the
         * repo the same as if the command would have been executed
@@ -311,32 +313,32 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
                        !path_inside_repo(prefix, argv[i + 1]))))
                no_index = DIFF_NO_INDEX_IMPLICIT;
 
-       gitmodules_config();
+       if (!no_index)
+               gitmodules_config();
        git_config(git_diff_ui_config, NULL);
 
        init_revisions(&rev, prefix);
 
-       if (no_index) {
-               if (argc != i + 2) {
-                       if (no_index == DIFF_NO_INDEX_IMPLICIT) {
-                               /*
-                                * There was no --no-index and there were not two
-                                * paths. It is possible that the user intended
-                                * to do an inside-repository operation.
-                                */
-                               fprintf(stderr, "Not a git repository\n");
-                               fprintf(stderr,
-                                       "To compare two paths outside a working tree:\n");
-                       }
-                       /* Give the usage message for non-repository usage and exit. */
-                       usagef("git diff %s <path> <path>",
-                              no_index == DIFF_NO_INDEX_EXPLICIT ?
-                                       "--no-index" : "[--no-index]");
-
+       if (no_index && argc != i + 2) {
+               if (no_index == DIFF_NO_INDEX_IMPLICIT) {
+                       /*
+                        * There was no --no-index and there were not two
+                        * paths. It is possible that the user intended
+                        * to do an inside-repository operation.
+                        */
+                       fprintf(stderr, "Not a git repository\n");
+                       fprintf(stderr,
+                               "To compare two paths outside a working tree:\n");
                }
+               /* Give the usage message for non-repository usage and exit. */
+               usagef("git diff %s <path> <path>",
+                      no_index == DIFF_NO_INDEX_EXPLICIT ?
+                      "--no-index" : "[--no-index]");
+
+       }
+       if (no_index)
                /* If this is a no-index diff, just run it and exit there. */
                diff_no_index(&rev, argc, argv, prefix);
-       }
 
        /* Otherwise, we are doing the usual "git" diff */
        rev.diffopt.skip_stat_unmatch = !!diff_auto_refresh_index;