author | Junio C Hamano <gitster@pobox.com> | |
Fri, 31 Oct 2008 01:08:58 +0000 (18:08 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 31 Oct 2008 01:08:58 +0000 (18:08 -0700) | ||
commit | 98b35e2c749614446b916230148d66857e8a09f3 | |
tree | 3cf15ee4e22a7ebf84e92b019a26ef424d540857 | tree | snapshot |
parent | 058412d09748c90be996a70729b961adad084175 | commit | diff |
parent | a4f34cbb4cea1f0b0e625b528f269f4b517c64f8 | commit | diff |
Merge branch 'ar/maint-mksnpath' into ar/mksnpath
* 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
* 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
builtin-reflog.c | diff1 | | diff2 | | blob | history |
builtin-revert.c | diff1 | | diff2 | | blob | history |
builtin-tag.c | diff1 | | diff2 | | blob | history |
cache.h | diff1 | | diff2 | | blob | history |
config.c | diff1 | | diff2 | | blob | history |
environment.c | diff1 | | diff2 | | blob | history |
refs.c | diff1 | | diff2 | | blob | history |
rerere.c | diff1 | | diff2 | | blob | history |