As each constant is used in only one place, they are not
helping us avoid duplication. And they may be actively
misleading, as a version check is now much more complicated
than a simple integer comparison. The logic is in
verify_repository_format, and if you are thinking about
bumping the version, you _should_ have to go look at that
function.
Signed-off-by: Jeff King <peff@xxxxxxxx>
---
builtin/init-db.c | 5 +----
cache.h | 7 -------
setup.c | 6 +++---
3 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/builtin/init-db.c b/builtin/init-db.c
index d9934f3..ee2156e 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -176,7 +176,6 @@ static int create_default_files(const char *template_path)
struct stat st1;
struct strbuf buf = STRBUF_INIT;
char *path;
- char repo_version_string[10];
char junk[2];
int reinit;
int filemode;
@@ -228,9 +227,7 @@ static int create_default_files(const char *template_path)
}
/* This forces creation of new config file */
- xsnprintf(repo_version_string, sizeof(repo_version_string),
- "%d", GIT_REPO_VERSION);
- git_config_set("core.repositoryformatversion", repo_version_string);
+ git_config_set("core.repositoryformatversion", "0");
/* Check filemode trustability */
path = git_path_buf(&buf, "config");
diff --git a/cache.h b/cache.h
index ecefa00..d9c23d5 100644
--- a/cache.h
+++ b/cache.h
@@ -740,13 +740,6 @@ extern char *notes_ref_name;
extern int grafts_replace_parents;
-/*
- * GIT_REPO_VERSION is the version we write by default. The
- * _READ variant is the highest number we know how to
- * handle.
- */
-#define GIT_REPO_VERSION 0
-#define GIT_REPO_VERSION_READ 1
extern int repository_format_precious_objects;
struct repository_format {
diff --git a/setup.c b/setup.c
index f52011e..75d5939 100644
--- a/setup.c
+++ b/setup.c
@@ -460,9 +460,9 @@ void read_repository_format(struct repository_format *format, const char *path)
int verify_repository_format(const struct repository_format *format,
struct strbuf *err)
{
- if (GIT_REPO_VERSION_READ < format->version) {
- strbuf_addf(err, "Expected git repo version <= %d, found %d",
- GIT_REPO_VERSION_READ, format->version);
+ if (format->version > 1) {
+ strbuf_addf(err, "Expected git repo version <= 1, found %d",
+ format->version);
return -1;
}
--
2.8.0.rc0.278.gfeb5644
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html