From bbee6e0814d5875b85b81f26fd4ca7a28b6f9570 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sun, 31 May 2020 20:58:28 +0000 Subject: Vendor import svn-1.14.0. --- subversion/svn/util.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'subversion/svn/util.c') diff --git a/subversion/svn/util.c b/subversion/svn/util.c index a18e5f37c9f7..757983a9963f 100644 --- a/subversion/svn/util.c +++ b/subversion/svn/util.c @@ -163,6 +163,8 @@ svn_cl__merge_file_externally(const char *base_path, arguments[5] = wc_path; arguments[6] = NULL; + /* Presumably apr_filepath_get() returns a valid path, so we don't have + to use the safe version of svn_dirent_internal_style() here. */ SVN_ERR(svn_io_run_cmd(svn_dirent_internal_style(cwd, pool), merge_tool, arguments, &exitcode, NULL, TRUE, NULL, NULL, NULL, pool)); -- cgit v1.2.3