projects
/
platform
/
upstream
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 2.21.0
[platform/upstream/git.git]
/
environment.c
diff --git
a/environment.c
b/environment.c
index
c7b76d3
..
89af47c
100644
(file)
--- a/
environment.c
+++ b/
environment.c
@@
-80,7
+80,7
@@
enum log_refs_config log_all_ref_updates = LOG_REFS_UNSET;
int protect_hfs = PROTECT_HFS_DEFAULT;
#ifndef PROTECT_NTFS_DEFAULT
int protect_hfs = PROTECT_HFS_DEFAULT;
#ifndef PROTECT_NTFS_DEFAULT
-#define PROTECT_NTFS_DEFAULT
1
+#define PROTECT_NTFS_DEFAULT
0
#endif
int protect_ntfs = PROTECT_NTFS_DEFAULT;
const char *core_fsmonitor;
#endif
int protect_ntfs = PROTECT_NTFS_DEFAULT;
const char *core_fsmonitor;
@@
-107,7
+107,7
@@
char *git_work_tree_cfg;
static char *git_namespace;
static char *git_namespace;
-static c
onst c
har *super_prefix;
+static char *super_prefix;
/*
* Repository-local GIT_* environment variables; see cache.h for details.
/*
* Repository-local GIT_* environment variables; see cache.h for details.
@@
-240,7
+240,7
@@
const char *get_super_prefix(void)
{
static int initialized;
if (!initialized) {
{
static int initialized;
if (!initialized) {
- super_prefix =
getenv(GIT_SUPER_PREFIX_ENVIRONMENT
);
+ super_prefix =
xstrdup_or_null(getenv(GIT_SUPER_PREFIX_ENVIRONMENT)
);
initialized = 1;
}
return super_prefix;
initialized = 1;
}
return super_prefix;
@@
-274,9
+274,9
@@
const char *get_git_work_tree(void)
char *get_object_directory(void)
{
char *get_object_directory(void)
{
- if (!the_repository->objects->o
bjectdir
)
+ if (!the_repository->objects->o
db
)
BUG("git environment hasn't been setup");
BUG("git environment hasn't been setup");
- return the_repository->objects->o
bjectdir
;
+ return the_repository->objects->o
db->path
;
}
int odb_mkstemp(struct strbuf *temp_filename, const char *pattern)
}
int odb_mkstemp(struct strbuf *temp_filename, const char *pattern)