diff options
| author | Jens Lehmann <Jens.Lehmann@web.de> | 2009-03-20 08:48:55 +0100 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2009-03-20 14:44:28 -0700 |
| commit | e27430e777edeb777cdd02a777e1e3a4608a0b41 (patch) | |
| tree | 746684bbf737d48662b8d4a230af4b3ad326f5f1 | |
| parent | 379f84b8d19b5412aff5b9d6bd7bb1ada37b9353 (diff) | |
| download | git-e27430e777edeb777cdd02a777e1e3a4608a0b41.tar.gz git-e27430e777edeb777cdd02a777e1e3a4608a0b41.tar.xz | |
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>
| -rw-r--r-- | lib/mergetool.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
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] |