From 8e2d9cd5ab9aabbfe1e65f635e7a10c473240d69 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 26 Sep 2007 04:41:34 +0000 Subject: Bug #74615 - Quote all file paths inside dispatch-conf shell commands. (trunk r7803) svn path=/main/branches/2.1.2/; revision=7831 --- cnf/dispatch-conf.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cnf') diff --git a/cnf/dispatch-conf.conf b/cnf/dispatch-conf.conf index d4caa9557..d9ccc12a6 100644 --- a/cnf/dispatch-conf.conf +++ b/cnf/dispatch-conf.conf @@ -12,13 +12,13 @@ use-rcs=no # Diff for display # %s old file # %s new file -diff="diff -Nu %s %s | less --no-init --QUIT-AT-EOF" +diff="diff -Nu '%s' '%s' | less --no-init --QUIT-AT-EOF" # Diff for interactive merges. # %s output file # %s old file # %s new file -merge="sdiff --suppress-common-lines --output=%s %s %s" +merge="sdiff --suppress-common-lines --output='%s' '%s' '%s'" # Automerge files comprising only CVS interpolations (e.g. Header or Id) # (yes or no) -- cgit v1.2.3-1-g7c22