setup: allow check_repository_format to read repository format

bk2204 · gitster · commit cfe3917c85f3 · 2020-02-24T09:33:27.000-08:00
In some cases, we will want to not only check the repository format, but
extract the information that we've gained.  To do so, allow
check_repository_format to take a pointer to struct repository_format.
Allow passing NULL for this argument if we're not interested in the
information, and pass NULL for all existing callers.  A future patch
will make use of this information.

Signed-off-by: brian m. carlson &lt;sandals@crustytoothpaste.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/init-db.c b/builtin/init-db.c
@@ -378,7 +378,7 @@ int init_db(const char *git_dir, const char *real_git_dir,
 	 * config file, so this will not fail.  What we are catching
 	 * is an attempt to reinitialize new repository with an old tool.
 	 */
-	check_repository_format();
+	check_repository_format(NULL);
 
 	reinit = create_default_files(template_dir, original_git_dir);
 
diff --git a/cache.h b/cache.h
@@ -1086,8 +1086,10 @@ int verify_repository_format(const struct repository_format *format,
  * and die if it is a version we don't understand. Generally one would
  * set_git_dir() before calling this, and use it only for "are we in a valid
  * repo?".
+ *
+ * If successful and fmt is not NULL, fill fmt with data.
  */
-void check_repository_format(void);
+void check_repository_format(struct repository_format *fmt);
 
 #define MTIME_CHANGED	0x0001
 #define CTIME_CHANGED	0x0002
diff --git a/path.c b/path.c
@@ -851,7 +851,7 @@ const char *enter_repo(const char *path, int strict)
 
 	if (is_git_directory(".")) {
 		set_git_dir(".");
-		check_repository_format();
+		check_repository_format(NULL);
 		return path;
 	}
 
diff --git a/setup.c b/setup.c
@@ -1253,10 +1253,12 @@ int git_config_perm(const char *var, const char *value)
 	return -(i & 0666);
 }
 
-void check_repository_format(void)
+void check_repository_format(struct repository_format *fmt)
 {
 	struct repository_format repo_fmt = REPOSITORY_FORMAT_INIT;
-	check_repository_format_gently(get_git_dir(), &repo_fmt, NULL);
+	if (!fmt)
+		fmt = &repo_fmt;
+	check_repository_format_gently(get_git_dir(), fmt, NULL);
 	startup_info->have_repository = 1;
 	clear_repository_format(&repo_fmt);
 }

Original file line number	Diff line number	Diff line change
`@@ -851,7 +851,7 @@ const char enter_repo(const char path, int strict)`
`851`	`851`
`852`	`852`	`if (is_git_directory(".")) {`
`853`	`853`	`set_git_dir(".");`
`854`		`- check_repository_format();`
	`854`	`+ check_repository_format(NULL);`
`855`	`855`	`return path;`
`856`	`856`	`}`
`857`	`857`
Original file line number	Diff line number	Diff line change
`@@ -1253,10 +1253,12 @@ int git_config_perm(const char var, const char value)`
`1253`	`1253`	`return -(i & 0666);`
`1254`	`1254`	`}`
`1255`	`1255`
`1256`		`-void check_repository_format(void)`
	`1256`	`+void check_repository_format(struct repository_format *fmt)`
`1257`	`1257`	`{`
`1258`	`1258`	`struct repository_format repo_fmt = REPOSITORY_FORMAT_INIT;`
`1259`		`- check_repository_format_gently(get_git_dir(), &repo_fmt, NULL);`
	`1259`	`+ if (!fmt)`
	`1260`	`+ fmt = &repo_fmt;`
	`1261`	`+ check_repository_format_gently(get_git_dir(), fmt, NULL);`
`1260`	`1262`	`startup_info->have_repository = 1;`
`1261`	`1263`	`clear_repository_format(&repo_fmt);`
`1262`	`1264`	`}`