git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: David Turner <dturner@twopensource.com>, pclouds@gmail.com
Subject: [PATCH v2 01/10] setup: document check_repository_format()
Date: Fri, 11 Mar 2016 17:36:45 -0500	[thread overview]
Message-ID: <20160311223645.GA449@sigill.intra.peff.net> (raw)
In-Reply-To: <20160311223620.GA7963@sigill.intra.peff.net>

This function's interface is rather enigmatic, so let's
document it further.

While we're here, let's also drop the return value. It will
always either be "0" or the function will die (consequently,
neither of its two callers bothered to check the return).

Signed-off-by: Jeff King <peff@peff.net>
---
 cache.h | 9 ++++++++-
 setup.c | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/cache.h b/cache.h
index b829410..02e38d1 100644
--- a/cache.h
+++ b/cache.h
@@ -747,7 +747,14 @@ extern int grafts_replace_parents;
 #define GIT_REPO_VERSION_READ 1
 extern int repository_format_version;
 extern int repository_format_precious_objects;
-extern int check_repository_format(void);
+
+/*
+ * Check the repository format version in the path found in get_git_dir(),
+ * 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?".
+ */
+extern void check_repository_format(void);
 
 #define MTIME_CHANGED	0x0001
 #define CTIME_CHANGED	0x0002
diff --git a/setup.c b/setup.c
index de1a2a7..b2f2e69 100644
--- a/setup.c
+++ b/setup.c
@@ -982,9 +982,9 @@ int check_repository_format_version(const char *var, const char *value, void *cb
 	return 0;
 }
 
-int check_repository_format(void)
+void check_repository_format(void)
 {
-	return check_repository_format_gently(get_git_dir(), NULL);
+	check_repository_format_gently(get_git_dir(), NULL);
 }
 
 /*
-- 
2.8.0.rc2.328.g39e2a47

  reply	other threads:[~2016-03-11 22:36 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-11 22:36 [PATCH v2 0/10] cleaning up check_repository_format_gently Jeff King
2016-03-11 22:36 ` Jeff King [this message]
2016-03-11 22:36 ` [PATCH v2 02/10] wrap shared_repository global in get/set accessors Jeff King
2016-03-11 22:36 ` [PATCH v2 03/10] lazily load core.sharedrepository Jeff King
2016-03-11 22:36 ` [PATCH v2 04/10] check_repository_format_gently: stop using git_config_early Jeff King
2016-03-11 22:37 ` [PATCH v2 05/10] config: drop git_config_early Jeff King
2016-03-11 23:33   ` Junio C Hamano
2016-03-11 22:37 ` [PATCH v2 06/10] setup: refactor repo format reading and verification Jeff King
2016-03-11 22:37 ` [PATCH v2 07/10] init: use setup.c's repo version verification Jeff King
2016-03-11 22:37 ` [PATCH v2 08/10] setup: unify repository version callbacks Jeff King
2016-03-11 22:37 ` [PATCH v2 09/10] setup: drop repository_format_version global Jeff King
2016-03-11 22:37 ` [PATCH v2 10/10] verify_repository_format: mark messages for translation Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160311223645.GA449@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=dturner@twopensource.com \
    --cc=git@vger.kernel.org \
    --cc=pclouds@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).