summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Mark Lodato <lodatom@gmail.com>2009-09-12 20:33:23 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-09-13 01:28:07 -0700
commitd3d7d47e6e0c3077fa39ffcca2b7f5f48ea97812 (patch)
tree27f36a974a6947004d64ec131e721d968e0757ea /Documentation/merge-options.txt
parentMerge branch 'cb/maint-1.6.3-grep-relative-up' into maint (diff)
downloadtgif-d3d7d47e6e0c3077fa39ffcca2b7f5f48ea97812.tar.xz
svn: properly escape arguments for authors-prog
Previously, the call to authors-prog was not properly escaped, so any special characters in the Subversion username, such as spaces and semi-colons, would be interpreted by the shell rather than being passed in as the first argument. Now all unsafe characters are escaped using "git rev-parse --sq-quote" [ew: switched from "\Q..\E" to "rev-parse --sq-quote"] Signed-off-by: Mark Lodato <lodatom@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions