projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'lt/fix-sol-pack'
[git.git]
/
setup.c
diff --git
a/setup.c
b/setup.c
index
bde590f
..
36ede3d
100644
(file)
--- a/
setup.c
+++ b/
setup.c
@@
-131,7
+131,7
@@
const char *setup_git_directory_gently(int *nongit_ok)
if (validate_symref(path))
goto bad_dir_environ;
if (getenv(DB_ENVIRONMENT)) {
if (validate_symref(path))
goto bad_dir_environ;
if (getenv(DB_ENVIRONMENT)) {
- if (access(
DB_ENVIRONMENT
, X_OK))
+ if (access(
getenv(DB_ENVIRONMENT)
, X_OK))
goto bad_dir_environ;
}
else {
goto bad_dir_environ;
}
else {
@@
-180,6
+180,8
@@
int check_repository_format_version(const char *var, const char *value)
{
if (strcmp(var, "core.repositoryformatversion") == 0)
repository_format_version = git_config_int(var, value);
{
if (strcmp(var, "core.repositoryformatversion") == 0)
repository_format_version = git_config_int(var, value);
+ else if (strcmp(var, "core.sharedrepository") == 0)
+ shared_repository = git_config_bool(var, value);
return 0;
}
return 0;
}