read-cache: leave lock in right state in `write_locked_index()`

diff --git a/builtin/diff-files.c b/builtin/diff-files.c
index 15c61fd8d1ef891b013404ea5e7cbe42befac7bd..e88493ffe5d5d66461edb71832b58e8b3b4b2bc8 100644 (file)
--- a/builtin/diff-files.c
+++ b/builtin/diff-files.c
@@ -4,6 +4,7 @@
  * Copyright (C) Linus Torvalds, 2005
  */
 #include "cache.h"
+#include "config.h"
 #include "diff.h"
 #include "commit.h"
 #include "revision.h"
@@ -20,9 +21,11 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
        int result;
        unsigned options = 0;
 
-       init_revisions(&rev, prefix);
-       gitmodules_config();
+       if (argc == 2 && !strcmp(argv[1], "-h"))
+               usage(diff_files_usage);
+
        git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
+       init_revisions(&rev, prefix);
        rev.abbrev = 0;
        precompose_argv(argc, argv);