undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

setup: allow check_repository_format to read repository format

Browse Source 
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 <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson 2020-02-22 20:17:37 +00:00 committed by Junio C Hamano
parent bf154a8782
commit cfe3917c85
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/init-db.c
View File

@ -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 * config file, so this will not fail. What we are catching
* is an attempt to reinitialize new repository with an old tool. * 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); reinit = create_default_files(template_dir, original_git_dir);

4
cache.h
View File

@ -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 * 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 * set_git_dir() before calling this, and use it only for "are we in a valid
* repo?". * 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 MTIME_CHANGED 0x0001
#define CTIME_CHANGED 0x0002 #define CTIME_CHANGED 0x0002

2
path.c
View File

@ -851,7 +851,7 @@ const char *enter_repo(const char *path, int strict)
if (is_git_directory(".")) { if (is_git_directory(".")) {
set_git_dir("."); set_git_dir(".");
check_repository_format(); check_repository_format(NULL);
return path; return path;
} }

6
setup.c
View File

@ -1253,10 +1253,12 @@ int git_config_perm(const char *var, const char *value)
return -(i & 0666); return -(i & 0666);
} }
void check_repository_format(void) void check_repository_format(struct repository_format *fmt)
{ {
struct repository_format repo_fmt = REPOSITORY_FORMAT_INIT; 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; startup_info->have_repository = 1;
clear_repository_format(&repo_fmt); clear_repository_format(&repo_fmt);
} }