diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-05 11:35:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-05 11:35:53 -0800 |
| commit | a1a846a19e854a3b3baff8f55c039846880a2635 (patch) | |
| tree | 0d6aebb3626cbc4204a1ec455e3b2105b4733062 /environment.c | |
| parent | d95f91d9e48a88a39ac2de5bfddd9d33fd36435d (diff) | |
| parent | 98b35e2c749614446b916230148d66857e8a09f3 (diff) | |
| download | git-a1a846a19e854a3b3baff8f55c039846880a2635.tar.gz | |
Merge branch 'ar/mksnpath'
* ar/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
Fix potentially dangerous uses of mkpath and git_path
Fix potentially dangerous uses of mkpath and git_path
Fix mkpath abuse in dwim_ref and dwim_log of sha1_name.c
Add mksnpath which allows you to specify the output buffer
Conflicts:
builtin-revert.c
Diffstat (limited to 'environment.c')
| -rw-r--r-- | environment.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/environment.c b/environment.c index 0693cd9a42..bf93a598d0 100644 --- a/environment.c +++ b/environment.c @@ -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) |