diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-08 16:13:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-08 16:13:19 -0800 |
| commit | 8b1981d32b41f1b4e26d8d96a3c6e63b9bc746b0 (patch) | |
| tree | 13daae95357e1877e57e742dd9ea77ca5d3e3b16 /server-info.c | |
| parent | 3b8572a4297d8720b359c82e1dd9afeb45cda3cd (diff) | |
| parent | a4f34cbb4cea1f0b0e625b528f269f4b517c64f8 (diff) | |
| download | git-8b1981d32b41f1b4e26d8d96a3c6e63b9bc746b0.tar.gz | |
Merge branch 'ar/maint-mksnpath' into maint
* 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
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
rerere.c
Diffstat (limited to 'server-info.c')
| -rw-r--r-- | server-info.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server-info.c b/server-info.c index c1c073b2f0..66b0d9d878 100644 --- a/server-info.c +++ b/server-info.c @@ -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); |