Merge branch 'da/user-useconfigonly' into HEAD

diff --git a/cache.h b/cache.h
index 7704bc6c89e1b4c758f097e4b51d5ce5d126693d..2711048cad7d5c7bba04c5737aa6142caf49d023 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -747,7 +747,6 @@ extern int grafts_replace_parents;
  */
 #define GIT_REPO_VERSION 0
 #define GIT_REPO_VERSION_READ 1
-extern int repository_format_version;
 extern int repository_format_precious_objects;
 
 struct repository_format {
@@ -1802,7 +1801,7 @@ int split_cmdline(char *cmdline, const char ***argv);
 /* Takes a negative value returned by split_cmdline */
 const char *split_cmdline_strerror(int cmdline_errno);
 
-/* git.c */
+/* setup.c */
 struct startup_info {
        int have_repository;
        const char *prefix;