From: Jens Lehmann Date: Fri, 20 Mar 2009 07:48:55 +0000 (+0100) Subject: git-gui: Fix merge conflict display error when filename contains spaces X-Git-Tag: v1.6.3-rc4~1^2~3^2~3 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e27430e777edeb777cdd02a777e1e3a4608a0b41;p=git.git git-gui: Fix merge conflict display error when filename contains spaces When a merge conflict occurs in a file with spaces in the filename, git-gui showed wrongly "LOCAL: deleted". Signed-off-by: Jens Lehmann Signed-off-by: Shawn O. Pearce --- diff --git a/lib/mergetool.tcl b/lib/mergetool.tcl index eb2b4b56a..3e1b42beb 100644 --- a/lib/mergetool.tcl +++ b/lib/mergetool.tcl @@ -88,7 +88,7 @@ proc merge_load_stages {path cont} { set merge_stages(3) {} set merge_stages_buf {} - set merge_stages_fd [eval git_read ls-files -u -z -- $path] + set merge_stages_fd [eval git_read ls-files -u -z -- {$path}] fconfigure $merge_stages_fd -blocking 0 -translation binary -encoding binary fileevent $merge_stages_fd readable [list read_merge_stages $merge_stages_fd $cont]