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 <Jens.Lehmann@web.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Jens Lehmann committed
Mar 20, 2009 at 08:48 UTC
e27430e777edeb777cdd02a777e1e3a4608a0b41
1 file changed
+1
-1
lib/mergetool.tcl
+1
-1
@@ -88,7 +88,7 @@ proc merge_load_stages {path cont} {
88
set merge_stages(3) {}
89
set merge_stages_buf {}
90
91
- set merge_stages_fd [eval git_read ls-files -u -z -- $path]
91
+ set merge_stages_fd [eval git_read ls-files -u -z -- {$path}]
92
93
fconfigure $merge_stages_fd -blocking 0 -translation binary -encoding binary
94
fileevent $merge_stages_fd readable [list read_merge_stages $merge_stages_fd $cont]