kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Use git_pathdup instead of xstrdup(git_path(...)) 

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Alex Riesen 2008-10-27 11:22:09 +01:00 committed by Junio C Hamano
parent aba13e7c05
commit a4f34cbb4c
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-config.c
View File

@ -84,7 +84,7 @@ static int get_value(const char* key_, const char* regex_)
local = config_exclusive_filename; local = config_exclusive_filename;
if (!local) { if (!local) {
const char *home = getenv("HOME"); const char *home = getenv("HOME");
local = repo_config = xstrdup(git_path("config")); local = repo_config = git_pathdup("config");
if (git_config_global() && home) if (git_config_global() && home)
global = xstrdup(mkpath("%s/.gitconfig", home)); global = xstrdup(mkpath("%s/.gitconfig", home));
if (git_config_system()) if (git_config_system())

4
builtin-reflog.c
View File

@ -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); lock = lock_any_ref_for_update(ref, sha1, 0);
if (!lock) if (!lock)
return error("cannot lock ref '%s'", ref); 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)) if (!file_exists(log_file))
goto finish; goto finish;
if (!cmd->dry_run) { 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"); cb.newlog = fopen(newlog_path, "w");
} }



2
builtin-revert.c
View File

@ -269,7 +269,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
int i; int i;
char *oneline, *reencoded_message = NULL; char *oneline, *reencoded_message = NULL;
const char *message, *encoding; 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); git_config(git_default_config, NULL);
me = action == REVERT ? "revert" : "cherry-pick"; me = action == REVERT ? "revert" : "cherry-pick";

2
builtin-tag.c
View File

@ -283,7 +283,7 @@ static void create_tag(const unsigned char *object, const char *tag,
int fd; int fd;


/* write the template message before editing: */ /* 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); fd = open(path, O_CREAT | O_TRUNC | O_WRONLY, 0600);
if (fd < 0) if (fd < 0)
die("could not create file '%s': %s", die("could not create file '%s': %s",

6
config.c
View File

@ -630,7 +630,7 @@ int git_config(config_fn_t fn, void *data)
free(user_config); free(user_config);
} }


repo_config = xstrdup(git_path("config")); repo_config = git_pathdup("config");
ret += git_config_from_file(fn, repo_config, data); ret += git_config_from_file(fn, repo_config, data);
free(repo_config); free(repo_config);
return ret; return ret;
@ -872,7 +872,7 @@ int git_config_set_multivar(const char* key, const char* value,
if (config_exclusive_filename) if (config_exclusive_filename)
config_filename = xstrdup(config_exclusive_filename); config_filename = xstrdup(config_exclusive_filename);
else else
config_filename = xstrdup(git_path("config")); config_filename = git_pathdup("config");


/* /*
* Since "key" actually contains the section name and the real * 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) if (config_exclusive_filename)
config_filename = xstrdup(config_exclusive_filename); config_filename = xstrdup(config_exclusive_filename);
else else
config_filename = xstrdup(git_path("config")); config_filename = git_pathdup("config");
out_fd = hold_lock_file_for_update(lock, config_filename, 0); out_fd = hold_lock_file_for_update(lock, config_filename, 0);
if (out_fd < 0) { if (out_fd < 0) {
ret = error("could not lock config file %s", config_filename); ret = error("could not lock config file %s", config_filename);

2
environment.c
View File

@ -71,7 +71,7 @@ static void setup_git_env(void)
} }
git_graft_file = getenv(GRAFT_ENVIRONMENT); git_graft_file = getenv(GRAFT_ENVIRONMENT);
if (!git_graft_file) if (!git_graft_file)
git_graft_file = xstrdup(git_path("info/grafts")); git_graft_file = git_pathdup("info/grafts");
} }


int is_bare_repository(void) int is_bare_repository(void)

2
refs.c
View File

@ -1258,7 +1258,7 @@ int create_symref(const char *ref_target, const char *refs_heads_master,
const char *lockpath; const char *lockpath;
char ref[1000]; char ref[1000];
int fd, len, written; 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]; unsigned char old_sha1[20], new_sha1[20];


if (logmsg && read_ref(ref_target, old_sha1)) if (logmsg && read_ref(ref_target, old_sha1))

2
rerere.c
View File

@ -345,7 +345,7 @@ int setup_rerere(struct string_list *merge_rr)
if (!is_rerere_enabled()) if (!is_rerere_enabled())
return -1; 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); fd = hold_lock_file_for_update(&write_lock, merge_rr_path, 1);
read_rr(merge_rr); read_rr(merge_rr);
return fd; return fd;

2
server-info.c
View File

@ -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) static int update_info_refs(int force)
{ {
char *path0 = xstrdup(git_path("info/refs")); char *path0 = git_pathdup("info/refs");
int len = strlen(path0); int len = strlen(path0);
char *path1 = xmalloc(len + 2); char *path1 = xmalloc(len + 2);