зеркало из https://github.com/microsoft/git.git
Use git_pathdup instead of xstrdup(git_path(...))
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
aba13e7c05
Коммит
a4f34cbb4c
|
@ -84,7 +84,7 @@ static int get_value(const char* key_, const char* regex_)
|
|||
local = config_exclusive_filename;
|
||||
if (!local) {
|
||||
const char *home = getenv("HOME");
|
||||
local = repo_config = xstrdup(git_path("config"));
|
||||
local = repo_config = git_pathdup("config");
|
||||
if (git_config_global() && home)
|
||||
global = xstrdup(mkpath("%s/.gitconfig", home));
|
||||
if (git_config_system())
|
||||
|
|
|
@ -277,11 +277,11 @@ static int expire_reflog(const char *ref, const unsigned char *sha1, int unused,
|
|||
lock = lock_any_ref_for_update(ref, sha1, 0);
|
||||
if (!lock)
|
||||
return error("cannot lock ref '%s'", ref);
|
||||
log_file = xstrdup(git_path("logs/%s", ref));
|
||||
log_file = git_pathdup("logs/%s", ref);
|
||||
if (!file_exists(log_file))
|
||||
goto finish;
|
||||
if (!cmd->dry_run) {
|
||||
newlog_path = xstrdup(git_path("logs/%s.lock", ref));
|
||||
newlog_path = git_pathdup("logs/%s.lock", ref);
|
||||
cb.newlog = fopen(newlog_path, "w");
|
||||
}
|
||||
|
||||
|
|
|
@ -269,7 +269,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
|
|||
int i;
|
||||
char *oneline, *reencoded_message = NULL;
|
||||
const char *message, *encoding;
|
||||
const char *defmsg = xstrdup(git_path("MERGE_MSG"));
|
||||
const char *defmsg = git_pathdup("MERGE_MSG");
|
||||
|
||||
git_config(git_default_config, NULL);
|
||||
me = action == REVERT ? "revert" : "cherry-pick";
|
||||
|
|
|
@ -283,7 +283,7 @@ static void create_tag(const unsigned char *object, const char *tag,
|
|||
int fd;
|
||||
|
||||
/* write the template message before editing: */
|
||||
path = xstrdup(git_path("TAG_EDITMSG"));
|
||||
path = git_pathdup("TAG_EDITMSG");
|
||||
fd = open(path, O_CREAT | O_TRUNC | O_WRONLY, 0600);
|
||||
if (fd < 0)
|
||||
die("could not create file '%s': %s",
|
||||
|
|
6
config.c
6
config.c
|
@ -630,7 +630,7 @@ int git_config(config_fn_t fn, void *data)
|
|||
free(user_config);
|
||||
}
|
||||
|
||||
repo_config = xstrdup(git_path("config"));
|
||||
repo_config = git_pathdup("config");
|
||||
ret += git_config_from_file(fn, repo_config, data);
|
||||
free(repo_config);
|
||||
return ret;
|
||||
|
@ -872,7 +872,7 @@ int git_config_set_multivar(const char* key, const char* value,
|
|||
if (config_exclusive_filename)
|
||||
config_filename = xstrdup(config_exclusive_filename);
|
||||
else
|
||||
config_filename = xstrdup(git_path("config"));
|
||||
config_filename = git_pathdup("config");
|
||||
|
||||
/*
|
||||
* Since "key" actually contains the section name and the real
|
||||
|
@ -1132,7 +1132,7 @@ int git_config_rename_section(const char *old_name, const char *new_name)
|
|||
if (config_exclusive_filename)
|
||||
config_filename = xstrdup(config_exclusive_filename);
|
||||
else
|
||||
config_filename = xstrdup(git_path("config"));
|
||||
config_filename = git_pathdup("config");
|
||||
out_fd = hold_lock_file_for_update(lock, config_filename, 0);
|
||||
if (out_fd < 0) {
|
||||
ret = error("could not lock config file %s", config_filename);
|
||||
|
|
|
@ -71,7 +71,7 @@ static void setup_git_env(void)
|
|||
}
|
||||
git_graft_file = getenv(GRAFT_ENVIRONMENT);
|
||||
if (!git_graft_file)
|
||||
git_graft_file = xstrdup(git_path("info/grafts"));
|
||||
git_graft_file = git_pathdup("info/grafts");
|
||||
}
|
||||
|
||||
int is_bare_repository(void)
|
||||
|
|
2
refs.c
2
refs.c
|
@ -1258,7 +1258,7 @@ int create_symref(const char *ref_target, const char *refs_heads_master,
|
|||
const char *lockpath;
|
||||
char ref[1000];
|
||||
int fd, len, written;
|
||||
char *git_HEAD = xstrdup(git_path("%s", ref_target));
|
||||
char *git_HEAD = git_pathdup("%s", ref_target);
|
||||
unsigned char old_sha1[20], new_sha1[20];
|
||||
|
||||
if (logmsg && read_ref(ref_target, old_sha1))
|
||||
|
|
2
rerere.c
2
rerere.c
|
@ -345,7 +345,7 @@ int setup_rerere(struct string_list *merge_rr)
|
|||
if (!is_rerere_enabled())
|
||||
return -1;
|
||||
|
||||
merge_rr_path = xstrdup(git_path("MERGE_RR"));
|
||||
merge_rr_path = git_pathdup("MERGE_RR");
|
||||
fd = hold_lock_file_for_update(&write_lock, merge_rr_path, 1);
|
||||
read_rr(merge_rr);
|
||||
return fd;
|
||||
|
|
|
@ -25,7 +25,7 @@ static int add_info_ref(const char *path, const unsigned char *sha1, int flag, v
|
|||
|
||||
static int update_info_refs(int force)
|
||||
{
|
||||
char *path0 = xstrdup(git_path("info/refs"));
|
||||
char *path0 = git_pathdup("info/refs");
|
||||
int len = strlen(path0);
|
||||
char *path1 = xmalloc(len + 2);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче