git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Patrick Steinhardt <ps@pks.im>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>,
	ps@pks.im, Eric Sunshine <sunshine@sunshineco.com>,
	Stefan Beller <sbeller@google.com>,
	Lars Schneider <larsxschneider@gmail.com>,
	Michael Blume <blume.mike@gmail.com>
Subject: [PATCH v6 11/15] init-db: die on config errors when initializing empty repo
Date: Mon, 22 Feb 2016 12:23:32 +0100	[thread overview]
Message-ID: <1456140216-24169-12-git-send-email-ps@pks.im> (raw)
In-Reply-To: <1456140216-24169-1-git-send-email-ps@pks.im>

When creating an empty repository with `git init-db` we do not
check for error codes returned by `git_config_set` functions.
This may cause the user to end up with an inconsistent repository
without any indication for the user.

Fix this problem by dying early with an error message when we are
unable to write the configuration files to disk.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
 builtin/init-db.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/builtin/init-db.c b/builtin/init-db.c
index 07229d6..ef19048 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -227,7 +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_or_die("core.repositoryformatversion", repo_version_string);
 
 	/* Check filemode trustability */
 	path = git_path_buf(&buf, "config");
@@ -241,18 +241,18 @@ static int create_default_files(const char *template_path)
 		if (filemode && !reinit && (st1.st_mode & S_IXUSR))
 			filemode = 0;
 	}
-	git_config_set("core.filemode", filemode ? "true" : "false");
+	git_config_set_or_die("core.filemode", filemode ? "true" : "false");
 
 	if (is_bare_repository())
-		git_config_set("core.bare", "true");
+		git_config_set_or_die("core.bare", "true");
 	else {
 		const char *work_tree = get_git_work_tree();
-		git_config_set("core.bare", "false");
+		git_config_set_or_die("core.bare", "false");
 		/* allow template config file to override the default */
 		if (log_all_ref_updates == -1)
-		    git_config_set("core.logallrefupdates", "true");
+			git_config_set_or_die("core.logallrefupdates", "true");
 		if (needs_work_tree_config(get_git_dir(), work_tree))
-			git_config_set("core.worktree", work_tree);
+			git_config_set_or_die("core.worktree", work_tree);
 	}
 
 	if (!reinit) {
@@ -265,12 +265,12 @@ static int create_default_files(const char *template_path)
 		    S_ISLNK(st1.st_mode))
 			unlink(path); /* good */
 		else
-			git_config_set("core.symlinks", "false");
+			git_config_set_or_die("core.symlinks", "false");
 
 		/* Check if the filesystem is case-insensitive */
 		path = git_path_buf(&buf, "CoNfIg");
 		if (!access(path, F_OK))
-			git_config_set("core.ignorecase", "true");
+			git_config_set_or_die("core.ignorecase", "true");
 		probe_utf8_pathname_composition();
 	}
 
@@ -386,8 +386,8 @@ int init_db(const char *template_dir, unsigned int flags)
 			xsnprintf(buf, sizeof(buf), "%d", OLD_PERM_EVERYBODY);
 		else
 			die("BUG: invalid value for shared_repository");
-		git_config_set("core.sharedrepository", buf);
-		git_config_set("receive.denyNonFastforwards", "true");
+		git_config_set_or_die("core.sharedrepository", buf);
+		git_config_set_or_die("receive.denyNonFastforwards", "true");
 	}
 
 	if (!(flags & INIT_DB_QUIET)) {
-- 
2.7.1

  parent reply	other threads:[~2016-02-22 11:24 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-22 11:23 [PATCH v6 00/15] config: make git_config_set die on failure Patrick Steinhardt
2016-02-22 11:23 ` [PATCH v6 01/15] config: introduce set_or_die wrappers Patrick Steinhardt
2016-02-22 11:23 ` [PATCH v6 02/15] branch: report errors in tracking branch setup Patrick Steinhardt
2016-02-22 11:23 ` [PATCH v6 03/15] branch: die on config error when unsetting upstream Patrick Steinhardt
2016-02-22 11:23 ` [PATCH v6 04/15] branch: die on config error when editing branch description Patrick Steinhardt
2016-02-22 11:23 ` [PATCH v6 05/15] submodule: die on config error when linking modules Patrick Steinhardt
2016-02-22 11:23 ` [PATCH v6 06/15] submodule--helper: die on config error when cloning module Patrick Steinhardt
2016-02-22 11:23 ` [PATCH v6 07/15] remote: die on config error when setting URL Patrick Steinhardt
2016-02-22 11:23 ` [PATCH v6 08/15] remote: die on config error when setting/adding branches Patrick Steinhardt
2016-02-22 11:23 ` [PATCH v6 09/15] remote: die on config error when manipulating remotes Patrick Steinhardt
2016-02-22 11:23 ` [PATCH v6 10/15] clone: die on config error in cmd_clone Patrick Steinhardt
2016-02-22 11:23 ` Patrick Steinhardt [this message]
2016-02-22 11:23 ` [PATCH v6 12/15] sequencer: die on config error when saving replay opts Patrick Steinhardt
2016-02-22 11:23 ` [PATCH v6 13/15] compat: die when unable to set core.precomposeunicode Patrick Steinhardt
2016-02-22 11:23 ` [PATCH v6 14/15] config: rename git_config_set to git_config_set_gently Patrick Steinhardt
2016-02-22 11:23 ` [PATCH v6 15/15] config: rename git_config_set_or_die to git_config_set Patrick Steinhardt

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=1456140216-24169-12-git-send-email-ps@pks.im \
    --to=ps@pks.im \
    --cc=blume.mike@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=larsxschneider@gmail.com \
    --cc=peff@peff.net \
    --cc=sbeller@google.com \
    --cc=sunshine@sunshineco.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).