mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ar/maint-mksnpath' into ar/mksnpath

Browse Source 
* ar/maint-mksnpath:
  Use git_pathdup instead of xstrdup(git_path(...))
  git_pathdup: returns xstrdup-ed copy of the formatted path
  Fix potentially dangerous use of git_path in ref.c
  Add git_snpath: a .git path formatting routine with output buffer

Conflicts:
	builtin-revert.c
	refs.c
	rerere.c
This commit is contained in:
Junio C Hamano
2008-10-30 18:08:58 -07:00
parent 058412d097 a4f34cbb4c
commit 98b35e2c74
11 changed files with 60 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config.c
View File

@ -649,7 +649,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;
@ -889,7 +889,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
@ -1149,7 +1149,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);