author | Junio C Hamano <gitster@pobox.com> | |
Sun, 9 Nov 2008 00:13:19 +0000 (16:13 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 9 Nov 2008 00:13:19 +0000 (16:13 -0800) | ||
commit | 8b1981d32b41f1b4e26d8d96a3c6e63b9bc746b0 | |
tree | 13daae95357e1877e57e742dd9ea77ca5d3e3b16 | tree | snapshot |
parent | 3b8572a4297d8720b359c82e1dd9afeb45cda3cd | commit | diff |
parent | a4f34cbb4cea1f0b0e625b528f269f4b517c64f8 | commit | diff |
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
* 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
builtin-revert.c | diff1 | | diff2 | | blob | history |
builtin-tag.c | diff1 | | diff2 | | blob | history |
cache.h | diff1 | | diff2 | | blob | history |
path.c | diff1 | | diff2 | | blob | history |
refs.c | diff1 | | diff2 | | blob | history |
rerere.c | diff1 | | diff2 | | blob | history |