summaryrefslogtreecommitdiff
path: root/builtin/init-db.c
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2014-01-06 13:45:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-01-06 17:34:22 (GMT)
commitf3565c0ca535d3becdcd2266002385709ddfa66c (patch)
tree2d38070811653fc22e7cdc25974ff2d09b9edae8 /builtin/init-db.c
parent0be0521b23f46dac586e1b464fafe8b97027b645 (diff)
downloadgit-f3565c0ca535d3becdcd2266002385709ddfa66c.zip
git-f3565c0ca535d3becdcd2266002385709ddfa66c.tar.gz
git-f3565c0ca535d3becdcd2266002385709ddfa66c.tar.bz2
cmd_init_db(): when creating directories, handle errors conservatively
safe_create_leading_directories_const() returns a non-zero value on error. The old code at this calling site recognized a couple of particular error values, and treated all other return values as success. Instead, be more conservative: recognize the errors we are interested in, but treat any other nonzero values as failures. This is more robust in case somebody adds another possible return value without telling us. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/init-db.c')
-rw-r--r--builtin/init-db.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/builtin/init-db.c b/builtin/init-db.c
index 0bc14f3..ceeb138 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -515,13 +515,14 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
saved = shared_repository;
shared_repository = 0;
switch (safe_create_leading_directories_const(argv[0])) {
+ case SCLD_OK:
+ case SCLD_PERMS:
+ break;
case SCLD_EXISTS:
errno = EEXIST;
/* fallthru */
- case SCLD_FAILED:
- die_errno(_("cannot mkdir %s"), argv[0]);
- break;
default:
+ die_errno(_("cannot mkdir %s"), argv[0]);
break;
}
shared_repository = saved;